Commit 7ec9741b authored by Rob Clark's avatar Rob Clark
Browse files

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: default avatarRob Clark <robdclark@chromium.org>
Tested-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarStephen Boyd <sboyd@kernel.org>
parent fd698849

drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c

+7 −19
Original line number Diff line number Diff line
@@ -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;

			}



			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);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE