From patchwork Mon Feb 2 20:58:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 5764231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B452ABF440 for ; Mon, 2 Feb 2015 21:02:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCFB7207FD for ; Mon, 2 Feb 2015 21:02:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1EF012014A for ; Mon, 2 Feb 2015 21:02:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YIO6c-0003DN-P9; Mon, 02 Feb 2015 21:00:26 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YIO5i-0001LT-ON for linux-arm-kernel@lists.infradead.org; Mon, 02 Feb 2015 20:59:32 +0000 Received: by mail-pa0-f43.google.com with SMTP id eu11so86924422pac.2 for ; Mon, 02 Feb 2015 12:59:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V+UG3WrPWMvoXoQ8AqOn5XSlbtGB6TpzPuLxhfwYCVU=; b=SQjR9XGr/fADEYZpWHWyZ6mvlLxZbM/78cQpUzrtGpphSEIPEx2mBIQmKWhfV2/Xh2 2/L6Z8YbrUCttYvAu8BLpEPiwJV1K+jjmowex1uan4Busy52pGgivlzV+FhJpices29o EVsdoFtotB+e+xexZVa2Vf+pUcrpifUHAdP1INRoIeIizrnngAZloX4Wlgbg7XBOlQmu 0/5JUl/kvJw7VTpuXCHw8h3FvC+7OrJq74pabFlHLUy7J0Tw+Xm55+VaJ8uYXGaM6mJI VqZJn9ZcqnSAvVXKd3K7Jca7V1AXVVt9B9NO1HIJXvUCUxWpP8+KZYilXALbUr4Ick7Z Op9A== X-Received: by 10.66.253.197 with SMTP id ac5mr31864165pad.152.1422910749689; Mon, 02 Feb 2015 12:59:09 -0800 (PST) Received: from localhost (amazon.gigabitethernet4-0-6.asr1.snv2.gblx.net. [64.211.110.86]) by mx.google.com with ESMTPSA id oa17sm19757127pdb.5.2015.02.02.12.59.07 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Mon, 02 Feb 2015 12:59:08 -0800 (PST) From: Eduardo Valentin To: Linux PM , Viresh Kumar 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150202_125930_857608_D0655DB1 X-CRM114-Status: UNSURE ( 9.61 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-samsung-soc@vger.kernel.org, "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Eduardo Valentin , Kukjin Kim , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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__);