diff mbox series

drm/msm/dpu: ignore NULL clocks

Message ID 20191114185152.101059-1-robdclark@gmail.com (mailing list archive)
State Accepted
Commit 7ec9741b19c30390596c1a9e7c65cdc7b4d9fd45
Headers show
Series drm/msm/dpu: ignore NULL clocks | expand

Commit Message

Rob Clark Nov. 14, 2019, 6:51 p.m. UTC 
From: Rob Clark <robdclark@chromium.org>

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>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 26 ++++++---------------
 1 file changed, 7 insertions(+), 19 deletions(-)

Comments

Linus Walleij Nov. 14, 2019, 11:26 p.m. UTC | #1 
On Thu, Nov 14, 2019 at 7:54 PM Rob Clark <robdclark@gmail.com> wrote:

> From: Rob Clark <robdclark@chromium.org>
>
> 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>

Yours,
Linus Walleij
Stephen Boyd Nov. 17, 2019, 1:29 a.m. UTC | #2 
Quoting Rob Clark (2019-11-14 10:51:50)
> From: Rob Clark <robdclark@chromium.org>
> 
> 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>
> ---

Acked-by: Stephen Boyd <sboyd@kernel.org>
diff mbox series

Patch

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 27fbeb504362..ec1437b0ef75 100644
--- 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);
 		}
 	}