From patchwork Tue Dec 3 10:04:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 21950 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0D9F5202AE for ; Tue, 3 Dec 2013 10:04:51 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id oz11sf33997557veb.4 for ; Tue, 03 Dec 2013 02:04:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=6zegFcVqumTOrg244HZOn4Daapjk6PP2f8QOub2K/sE=; b=QVAJfJvmloI4Rck3mNPID2sZ8Bovdp3Kulj15tcVQxUapxwhQ0hZIqbAmCrx1oWNXK qrzfH0o7ewRd0ccjV6l+UFNix2gLXeXNilnPkr5APPAb6Fl+H3Kp9BhCRyEJ9pQDMkV+ Zc5dc8VwhCn0qiVoZhZqHkZ/Xv+enZn9fBPVX4HJRcLbXSee/r4ILB/raYElHOzIVEd2 GDWkPKF6jSzWsTVSwOxOGDD8sfqNPDbhRWOrbZS8Ym0KEFvmK8MHsUBnI+8NIBGGKO10 qSbwUO7qC5g/wSFQuouPB4Lp+z3tQwoq7GvwasMWd765gfQCBIUbv4TQgjkIfdAjjAe8 F7QA== X-Gm-Message-State: ALoCoQkEoMDYsdnRyhhVz+Uw3IN3KHXvD7a5OGeT/kinxsA1sZVvwo9+dZRETsQVoOFZQgKMlCYV X-Received: by 10.58.107.198 with SMTP id he6mr22392782veb.2.1386065090809; Tue, 03 Dec 2013 02:04:50 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.131.162 with SMTP id on2ls5274024qeb.73.gmail; Tue, 03 Dec 2013 02:04:50 -0800 (PST) X-Received: by 10.221.39.195 with SMTP id tn3mr55193210vcb.2.1386065090583; Tue, 03 Dec 2013 02:04:50 -0800 (PST) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id k10si31075701vca.124.2013.12.03.02.04.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Dec 2013 02:04:50 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ld13so9358231vcb.20 for ; Tue, 03 Dec 2013 02:04:50 -0800 (PST) X-Received: by 10.220.250.4 with SMTP id mm4mr1020541vcb.47.1386065090410; Tue, 03 Dec 2013 02:04:50 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp194637vcz; Tue, 3 Dec 2013 02:04:50 -0800 (PST) X-Received: by 10.112.137.138 with SMTP id qi10mr573272lbb.21.1386065089563; Tue, 03 Dec 2013 02:04:49 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx.google.com with ESMTPS id d9si16056564lad.45.2013.12.03.02.04.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Dec 2013 02:04:49 -0800 (PST) Received-SPF: neutral (google.com: 209.85.217.182 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id u14so8933012lbd.27 for ; Tue, 03 Dec 2013 02:04:49 -0800 (PST) X-Received: by 10.112.53.201 with SMTP id d9mr572986lbp.26.1386065088984; Tue, 03 Dec 2013 02:04:48 -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 i8sm35583394lbh.2.2013.12.03.02.04.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Dec 2013 02:04:48 -0800 (PST) From: Ulf Hansson To: Russell King , linux-arm-kernel@lists.infradead.org Cc: Ulf Hansson Subject: [PATCH 5/6] amba: Convert to clk_prepare_enable and clk_disable_unprepare Date: Tue, 3 Dec 2013 11:04:30 +0100 Message-Id: <1386065071-9529-6-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386065071-9529-1-git-send-email-ulf.hansson@linaro.org> References: <1386065071-9529-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index b90dc1e..0477131 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -151,36 +151,18 @@ 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; - - if (IS_ERR(pclk)) - return PTR_ERR(pclk); + pcdev->pclk = clk_get(&pcdev->dev, "apb_pclk"); - ret = clk_prepare(pclk); - if (ret) { - clk_put(pclk); - return ret; - } + if (IS_ERR(pcdev->pclk)) + return PTR_ERR(pcdev->pclk); - ret = clk_enable(pclk); - if (ret) { - clk_unprepare(pclk); - clk_put(pclk); - } - - return ret; + return clk_prepare_enable(pcdev->pclk); } 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); } /*