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: Xu Wang <vulab@iscas.ac.cn>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20201231094935.25737-1-vulab@iscas.ac.cn
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index b3b4267..7b24224 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -295,15 +295,12 @@ 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->tbu_rt_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);
+       clk_disable_unprepare(mdp5_kms->lut_clk);
 
        return 0;
 }
@@ -317,12 +314,9 @@ 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);
+       clk_prepare_enable(mdp5_kms->lut_clk);
+       clk_prepare_enable(mdp5_kms->tbu_clk);
+       clk_prepare_enable(mdp5_kms->tbu_rt_clk);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c
index 2f4895b..0ea5342 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c
@@ -136,10 +136,8 @@ 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);
+       clk_prepare_enable(mdp5_mdss->axi_clk);
+       clk_prepare_enable(mdp5_mdss->vsync_clk);
 
        return 0;
 }
@@ -149,10 +147,8 @@ 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->vsync_clk);
+       clk_disable_unprepare(mdp5_mdss->axi_clk);
        clk_disable_unprepare(mdp5_mdss->ahb_clk);
 
        return 0;