Commit 442f59b9 authored by Xu Wang's avatar Xu Wang Committed by Rob Clark
Browse files

drm/msm/mdp5: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare 



Because clk_prepare_enable() and clk_disable_unprepare() already checked
NULL clock parameter, so the additional checks are unnecessary, just
remove them.

Signed-off-by: default avatarXu Wang <vulab@iscas.ac.cn>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20201231094935.25737-1-vulab@iscas.ac.cn


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 993247ff

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+6 −12
Original line number Diff line number Diff line
@@ -295,14 +295,11 @@ static int mdp5_disable(struct mdp5_kms *mdp5_kms) 
	mdp5_kms->enable_count--;

	WARN_ON(mdp5_kms->enable_count < 0);



	if (mdp5_kms->tbu_rt_clk)

	clk_disable_unprepare(mdp5_kms->tbu_rt_clk);

	if (mdp5_kms->tbu_clk)

	clk_disable_unprepare(mdp5_kms->tbu_clk);

	clk_disable_unprepare(mdp5_kms->ahb_clk);

	clk_disable_unprepare(mdp5_kms->axi_clk);

	clk_disable_unprepare(mdp5_kms->core_clk);

	if (mdp5_kms->lut_clk)

	clk_disable_unprepare(mdp5_kms->lut_clk);



	return 0;
@@ -317,11 +314,8 @@ static int mdp5_enable(struct mdp5_kms *mdp5_kms) 
	clk_prepare_enable(mdp5_kms->ahb_clk);

	clk_prepare_enable(mdp5_kms->axi_clk);

	clk_prepare_enable(mdp5_kms->core_clk);

	if (mdp5_kms->lut_clk)

	clk_prepare_enable(mdp5_kms->lut_clk);

	if (mdp5_kms->tbu_clk)

	clk_prepare_enable(mdp5_kms->tbu_clk);

	if (mdp5_kms->tbu_rt_clk)

	clk_prepare_enable(mdp5_kms->tbu_rt_clk);



	return 0;

drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c

+4 −8
Original line number Diff line number Diff line
@@ -136,9 +136,7 @@ static int mdp5_mdss_enable(struct msm_mdss *mdss) 
	DBG("");



	clk_prepare_enable(mdp5_mdss->ahb_clk);

	if (mdp5_mdss->axi_clk)

	clk_prepare_enable(mdp5_mdss->axi_clk);

	if (mdp5_mdss->vsync_clk)

	clk_prepare_enable(mdp5_mdss->vsync_clk);



	return 0;
@@ -149,9 +147,7 @@ static int mdp5_mdss_disable(struct msm_mdss *mdss) 
	struct mdp5_mdss *mdp5_mdss = to_mdp5_mdss(mdss);

	DBG("");



	if (mdp5_mdss->vsync_clk)

	clk_disable_unprepare(mdp5_mdss->vsync_clk);

	if (mdp5_mdss->axi_clk)

	clk_disable_unprepare(mdp5_mdss->axi_clk);

	clk_disable_unprepare(mdp5_mdss->ahb_clk);