Switch to managed clk_get to properly release resources when
they are not needed.
Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
Cc: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
Cc: Kukjin Kim <kgene@xxxxxxxxxx>
Cc: linux-pm@xxxxxxxxxxxxxxx
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: linux-samsung-soc@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Eduardo Valentin <edubezval@xxxxxxxxx>
---
drivers/cpufreq/exynos4210-cpufreq.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c
index 8a25dce..fc02a39 100644
--- a/drivers/cpufreq/exynos4210-cpufreq.c
+++ b/drivers/cpufreq/exynos4210-cpufreq.c
@@ -142,23 +142,23 @@ int exynos4210_cpufreq_init(struct exynos_dvfs_info *info)
return -EFAULT;
}
- cpu_clk = clk_get(NULL, "armclk");
+ cpu_clk = devm_clk_get(info->dev, "armclk");
if (IS_ERR(cpu_clk))
- return PTR_ERR(cpu_clk);
+ goto err;
- moutcore = clk_get(NULL, "moutcore");
+ moutcore = devm_clk_get(info->dev, "moutcore");
if (IS_ERR(moutcore))
- goto err_moutcore;
+ goto err;
- mout_mpll = clk_get(NULL, "mout_mpll");
+ mout_mpll = devm_clk_get(info->dev, "mout_mpll");
if (IS_ERR(mout_mpll))
- goto err_mout_mpll;
+ goto err;
rate = clk_get_rate(mout_mpll) / 1000;
- mout_apll = clk_get(NULL, "mout_apll");
+ mout_apll = devm_clk_get(info->dev, "mout_apll");
if (IS_ERR(mout_apll))
- goto err_mout_apll;
+ goto err;
info->mpll_freq_khz = rate;
/* 800Mhz */
@@ -173,13 +173,7 @@ int exynos4210_cpufreq_init(struct exynos_dvfs_info *info)
return 0;
-err_mout_apll:
- clk_put(mout_mpll);
-err_mout_mpll:
- clk_put(moutcore);
-err_moutcore:
- clk_put(cpu_clk);
-
+err:
iounmap(info->cmu_regs);
of_node_put(np);
pr_debug("%s: failed initialization\n", __func__);
--
2.1.3
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
