Skip to content

Commit a8bb0e8

Browse files
TinyWindzzvireshk
authored andcommitted
memory: samsung: exynos5422-dmc: Convert to use resource-managed OPP API
Use resource-managed OPP API to simplify code. Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
1 parent 6d8a154 commit a8bb0e8

1 file changed

Lines changed: 3 additions & 10 deletions

File tree

drivers/memory/samsung/exynos5422-dmc.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
343343
int idx;
344344
unsigned long freq;
345345

346-
ret = dev_pm_opp_of_add_table(dmc->dev);
346+
ret = devm_pm_opp_of_add_table(dmc->dev);
347347
if (ret < 0) {
348348
dev_err(dmc->dev, "Failed to get OPP table\n");
349349
return ret;
@@ -354,15 +354,15 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
354354
dmc->opp = devm_kmalloc_array(dmc->dev, dmc->opp_count,
355355
sizeof(struct dmc_opp_table), GFP_KERNEL);
356356
if (!dmc->opp)
357-
goto err_opp;
357+
return -ENOMEM;
358358

359359
idx = dmc->opp_count - 1;
360360
for (i = 0, freq = ULONG_MAX; i < dmc->opp_count; i++, freq--) {
361361
struct dev_pm_opp *opp;
362362

363363
opp = dev_pm_opp_find_freq_floor(dmc->dev, &freq);
364364
if (IS_ERR(opp))
365-
goto err_opp;
365+
return PTR_ERR(opp);
366366

367367
dmc->opp[idx - i].freq_hz = freq;
368368
dmc->opp[idx - i].volt_uv = dev_pm_opp_get_voltage(opp);
@@ -371,11 +371,6 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
371371
}
372372

373373
return 0;
374-
375-
err_opp:
376-
dev_pm_opp_of_remove_table(dmc->dev);
377-
378-
return -EINVAL;
379374
}
380375

381376
/**
@@ -1567,8 +1562,6 @@ static int exynos5_dmc_remove(struct platform_device *pdev)
15671562
clk_disable_unprepare(dmc->mout_bpll);
15681563
clk_disable_unprepare(dmc->fout_bpll);
15691564

1570-
dev_pm_opp_remove_table(dmc->dev);
1571-
15721565
return 0;
15731566
}
15741567

0 commit comments

Comments
 (0)