Commit ded61d7d authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/mdss: switch mdss to use devm_of_icc_get() 



Stop using hand-written reset function for ICC release, use
devm_of_icc_get() instead.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/570161/
Link: https://lore.kernel.org/r/20231202224247.1282567-2-dmitry.baryshkov@linaro.org
parent fec254cc

drivers/gpu/drm/msm/msm_mdss.c

+2 −14
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ static int msm_mdss_parse_data_bus_icc_path(struct device *dev, 
	struct icc_path *path0;

	struct icc_path *path1;



	path0 = of_icc_get(dev, "mdp0-mem");

	path0 = devm_of_icc_get(dev, "mdp0-mem");

	if (IS_ERR_OR_NULL(path0))

		return PTR_ERR_OR_ZERO(path0);



	msm_mdss->path[0] = path0;

	msm_mdss->num_paths = 1;



	path1 = of_icc_get(dev, "mdp1-mem");

	path1 = devm_of_icc_get(dev, "mdp1-mem");

	if (!IS_ERR_OR_NULL(path1)) {

		msm_mdss->path[1] = path1;

		msm_mdss->num_paths++;
@@ -66,15 +66,6 @@ static int msm_mdss_parse_data_bus_icc_path(struct device *dev, 
	return 0;

}



static void msm_mdss_put_icc_path(void *data)

{

	struct msm_mdss *msm_mdss = data;

	int i;



	for (i = 0; i < msm_mdss->num_paths; i++)

		icc_put(msm_mdss->path[i]);

}



static void msm_mdss_icc_request_bw(struct msm_mdss *msm_mdss, unsigned long bw)

{

	int i;
@@ -391,9 +382,6 @@ static struct msm_mdss *msm_mdss_init(struct platform_device *pdev, bool is_mdp5 
	dev_dbg(&pdev->dev, "mapped mdss address space @%pK\n", msm_mdss->mmio);



	ret = msm_mdss_parse_data_bus_icc_path(&pdev->dev, msm_mdss);

	if (ret)

		return ERR_PTR(ret);

	ret = devm_add_action_or_reset(&pdev->dev, msm_mdss_put_icc_path, msm_mdss);

	if (ret)

		return ERR_PTR(ret);