drm/msm/dpu: ignore NULL clocks

This isn't an error.  Also the clk APIs handle the NULL case, so we can
just delete the check.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Tested-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
index 27fbeb5..ec1437b 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c
@@ -93,19 +93,12 @@ int msm_dss_enable_clk(struct dss_clk *clk_arry, int num_clk, int enable)
                        DEV_DBG("%pS->%s: enable '%s'\n",
                                __builtin_return_address(0), __func__,
                                clk_arry[i].clk_name);
-                       if (clk_arry[i].clk) {
-                               rc = clk_prepare_enable(clk_arry[i].clk);
-                               if (rc)
-                                       DEV_ERR("%pS->%s: %s en fail. rc=%d\n",
-                                               __builtin_return_address(0),
-                                               __func__,
-                                               clk_arry[i].clk_name, rc);
-                       } else {
-                               DEV_ERR("%pS->%s: '%s' is not available\n",
-                                       __builtin_return_address(0), __func__,
-                                       clk_arry[i].clk_name);
-                               rc = -EPERM;
-                       }
+                       rc = clk_prepare_enable(clk_arry[i].clk);
+                       if (rc)
+                               DEV_ERR("%pS->%s: %s en fail. rc=%d\n",
+                                       __builtin_return_address(0),
+                                       __func__,
+                                       clk_arry[i].clk_name, rc);
 
                        if (rc && i) {
                                msm_dss_enable_clk(&clk_arry[i - 1],
@@ -119,12 +112,7 @@ int msm_dss_enable_clk(struct dss_clk *clk_arry, int num_clk, int enable)
                                __builtin_return_address(0), __func__,
                                clk_arry[i].clk_name);
 
-                       if (clk_arry[i].clk)
-                               clk_disable_unprepare(clk_arry[i].clk);
-                       else
-                               DEV_ERR("%pS->%s: '%s' is not available\n",
-                                       __builtin_return_address(0), __func__,
-                                       clk_arry[i].clk_name);
+                       clk_disable_unprepare(clk_arry[i].clk);
                }
        }