Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965144AbbBBU7O (ORCPT ); Mon, 2 Feb 2015 15:59:14 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:39180 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965055AbbBBU7K (ORCPT ); Mon, 2 Feb 2015 15:59:10 -0500 From: Eduardo Valentin To: Linux PM , Viresh Kumar Cc: Eduardo Valentin , "Rafael J. Wysocki" , Kukjin Kim , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/14] cpufreq: exynos4x12: use devm_clk_get Date: Mon, 2 Feb 2015 16:58:09 -0400 Message-Id: <1422910697-5920-7-git-send-email-edubezval@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1422910697-5920-1-git-send-email-edubezval@gmail.com> References: <1422910697-5920-1-git-send-email-edubezval@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2134 Lines: 74 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@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin --- drivers/cpufreq/exynos4x12-cpufreq.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c index 3da36baf..7e0dd2a 100644 --- a/drivers/cpufreq/exynos4x12-cpufreq.c +++ b/drivers/cpufreq/exynos4x12-cpufreq.c @@ -189,23 +189,23 @@ int exynos4x12_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; if (info->type == EXYNOS_SOC_4212) apll_freq_4x12 = apll_freq_4212; @@ -225,13 +225,7 @@ int exynos4x12_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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/