From mboxrd@z Thu Jan 1 00:00:00 1970 From: edubezval@gmail.com (Eduardo Valentin) Date: Mon, 2 Feb 2015 16:58:12 -0400 Subject: [PATCH 09/14] cpufreq: exynos5250: use devm_clk_get In-Reply-To: <1422910697-5920-1-git-send-email-edubezval@gmail.com> References: <1422910697-5920-1-git-send-email-edubezval@gmail.com> Message-ID: <1422910697-5920-10-git-send-email-edubezval@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Switch to managed clk_get to properly release resources when they are not needed. Cc: "Rafael J. Wysocki" Cc: Viresh Kumar Cc: Kukjin Kim Cc: linux-pm at vger.kernel.org Cc: linux-arm-kernel at lists.infradead.org Cc: linux-samsung-soc at vger.kernel.org Cc: linux-kernel at vger.kernel.org Signed-off-by: Eduardo Valentin --- drivers/cpufreq/exynos5250-cpufreq.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/cpufreq/exynos5250-cpufreq.c b/drivers/cpufreq/exynos5250-cpufreq.c index e61d149..d3ce829 100644 --- a/drivers/cpufreq/exynos5250-cpufreq.c +++ b/drivers/cpufreq/exynos5250-cpufreq.c @@ -168,23 +168,23 @@ int exynos5250_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, "mout_cpu"); + moutcore = devm_clk_get(info->dev, "mout_cpu"); 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 */ @@ -199,13 +199,7 @@ int exynos5250_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_err("%s: failed initialization\n", __func__); -- 2.1.3