Skip to content

Commit ded61d7

Browse files
committed
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: Dmitry Baryshkov <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/570161/ Link: https://lore.kernel.org/r/[email protected]
1 parent fec254c commit ded61d7

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

drivers/gpu/drm/msm/msm_mdss.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ static int msm_mdss_parse_data_bus_icc_path(struct device *dev,
5050
struct icc_path *path0;
5151
struct icc_path *path1;
5252

53-
path0 = of_icc_get(dev, "mdp0-mem");
53+
path0 = devm_of_icc_get(dev, "mdp0-mem");
5454
if (IS_ERR_OR_NULL(path0))
5555
return PTR_ERR_OR_ZERO(path0);
5656

5757
msm_mdss->path[0] = path0;
5858
msm_mdss->num_paths = 1;
5959

60-
path1 = of_icc_get(dev, "mdp1-mem");
60+
path1 = devm_of_icc_get(dev, "mdp1-mem");
6161
if (!IS_ERR_OR_NULL(path1)) {
6262
msm_mdss->path[1] = path1;
6363
msm_mdss->num_paths++;
@@ -66,15 +66,6 @@ static int msm_mdss_parse_data_bus_icc_path(struct device *dev,
6666
return 0;
6767
}
6868

69-
static void msm_mdss_put_icc_path(void *data)
70-
{
71-
struct msm_mdss *msm_mdss = data;
72-
int i;
73-
74-
for (i = 0; i < msm_mdss->num_paths; i++)
75-
icc_put(msm_mdss->path[i]);
76-
}
77-
7869
static void msm_mdss_icc_request_bw(struct msm_mdss *msm_mdss, unsigned long bw)
7970
{
8071
int i;
@@ -391,9 +382,6 @@ static struct msm_mdss *msm_mdss_init(struct platform_device *pdev, bool is_mdp5
391382
dev_dbg(&pdev->dev, "mapped mdss address space @%pK\n", msm_mdss->mmio);
392383

393384
ret = msm_mdss_parse_data_bus_icc_path(&pdev->dev, msm_mdss);
394-
if (ret)
395-
return ERR_PTR(ret);
396-
ret = devm_add_action_or_reset(&pdev->dev, msm_mdss_put_icc_path, msm_mdss);
397385
if (ret)
398386
return ERR_PTR(ret);
399387

0 commit comments

Comments
 (0)