From patchwork Tue Dec 3 10:49:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3275301 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17BA2C0D4A for ; Tue, 3 Dec 2013 10:50:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB79F20304 for ; Tue, 3 Dec 2013 10:50:11 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 9FCB2202FF for ; Tue, 3 Dec 2013 10:50:10 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VnnYH-00040R-AH; Tue, 03 Dec 2013 10:50:01 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VnnYE-0008ML-Qe; Tue, 03 Dec 2013 10:49:58 +0000 Received: from mail-lb0-f174.google.com ([209.85.217.174]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VnnYB-0008LF-UA for linux-arm-kernel@lists.infradead.org; Tue, 03 Dec 2013 10:49:56 +0000 Received: by mail-lb0-f174.google.com with SMTP id c11so8823039lbj.33 for ; Tue, 03 Dec 2013 02:49:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dPW3nacrP1z94I78cnqIN5Z274xPNR13fp2eCKceiMs=; b=fkGZczcrFptjxQx61EMWQI7hnsutp5yywGIaumrPOXGGlnhZTLqoUniO4Nwl+OHfcq wUdFt+PB9ASvisUhaZqeArigZ2fSHZI2eo1aNsgyh3xzEEG3Kk3hsboshkjQvJIPM7/d kDT0tGQ5Y8xeJYvdHPj+egAcxw8PREW3C8pmUObXZSnyINy34e9m2dP/RrGnS+gQZ6mn GyyEqrzud166uo8HRxy4PWsDFTKSGNRLD7Rqrt41pq7CHX69tnhL/XSMbuYuOGfQACZg CpPMtznUTUXaKKg//7ylSGvkT5bj0bMfsZS1vwmnmtzh3MnuPgRwwcaMx5wJlcAcKNwZ GpIw== X-Gm-Message-State: ALoCoQmoVuyb83k/GD0ToDXVJyF8THftMBtzgUcpi1GKZfXsBS429OsJz3Af3zsw/92LefXlse98 X-Received: by 10.112.201.197 with SMTP id kc5mr36068lbc.64.1386067768954; Tue, 03 Dec 2013 02:49:28 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id t9sm60735763lat.1.2013.12.03.02.49.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Dec 2013 02:49:28 -0800 (PST) From: Ulf Hansson To: Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH V2 5/6] amba: Convert to clk_prepare_enable and clk_disable_unprepare Date: Tue, 3 Dec 2013 11:49:24 +0100 Message-Id: <1386067764-25138-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131203_054956_105893_9E9E192E X-CRM114-Status: GOOD ( 10.91 ) X-Spam-Score: -2.6 (--) Cc: Ulf Hansson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 To simplify code and error handling let's use clk_prepare_enable and clk_disable_unprepare. No functional change. Signed-off-by: Ulf Hansson --- drivers/amba/bus.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index b90dc1e..ea1d835 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -151,36 +151,23 @@ postcore_initcall(amba_init); static int amba_get_enable_pclk(struct amba_device *pcdev) { - struct clk *pclk = clk_get(&pcdev->dev, "apb_pclk"); int ret; - pcdev->pclk = pclk; + pcdev->pclk = clk_get(&pcdev->dev, "apb_pclk"); + if (IS_ERR(pcdev->pclk)) + return PTR_ERR(pcdev->pclk); - if (IS_ERR(pclk)) - return PTR_ERR(pclk); - - ret = clk_prepare(pclk); - if (ret) { - clk_put(pclk); - return ret; - } - - ret = clk_enable(pclk); - if (ret) { - clk_unprepare(pclk); - clk_put(pclk); - } + ret = clk_prepare_enable(pcdev->pclk); + if (ret) + clk_put(pcdev->pclk); return ret; } static void amba_put_disable_pclk(struct amba_device *pcdev) { - struct clk *pclk = pcdev->pclk; - - clk_disable(pclk); - clk_unprepare(pclk); - clk_put(pclk); + clk_disable_unprepare(pcdev->pclk); + clk_put(pcdev->pclk); } /*