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>

diff --git a/drivers/memory/samsung/exynos5422-dmc.c b/drivers/memory/samsung/exynos5422-dmc.c
index 1dabb509dec3a1a2ebb129e28d17485f143a6f6a..56f6e65d40cd63484aada55332bf6db72881e231 100644 (file)
--- a/drivers/memory/samsung/exynos5422-dmc.c
+++ b/drivers/memory/samsung/exynos5422-dmc.c
@@ -343,7 +343,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
        int idx;
        unsigned long freq;
 
-       ret = dev_pm_opp_of_add_table(dmc->dev);
+       ret = devm_pm_opp_of_add_table(dmc->dev);
        if (ret < 0) {
                dev_err(dmc->dev, "Failed to get OPP table\n");
                return ret;
@@ -354,7 +354,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
        dmc->opp = devm_kmalloc_array(dmc->dev, dmc->opp_count,
                                      sizeof(struct dmc_opp_table), GFP_KERNEL);
        if (!dmc->opp)
-               goto err_opp;
+               return -ENOMEM;
 
        idx = dmc->opp_count - 1;
        for (i = 0, freq = ULONG_MAX; i < dmc->opp_count; i++, freq--) {
@@ -362,7 +362,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc,
 
                opp = dev_pm_opp_find_freq_floor(dmc->dev, &freq);
                if (IS_ERR(opp))
-                       goto err_opp;
+                       return PTR_ERR(opp);
 
                dmc->opp[idx - i].freq_hz = freq;
                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,
        }
 
        return 0;
-
-err_opp:
-       dev_pm_opp_of_remove_table(dmc->dev);
-
-       return -EINVAL;
 }
 
 /**
@@ -1567,8 +1562,6 @@ static int exynos5_dmc_remove(struct platform_device *pdev)
        clk_disable_unprepare(dmc->mout_bpll);
        clk_disable_unprepare(dmc->fout_bpll);
 
-       dev_pm_opp_remove_table(dmc->dev);
-
        return 0;
 }