From: Julia Lawall <julia.lawall@lip6.fr>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>, Chris Ball <cjb@laptop.org>,
kernel-janitors@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Russell King <linux@arm.linux.org.uk>
Subject: Re: [PATCH 7/13] drivers/mmc/host/mmci.c: use clk_prepare_enable and clk_disable_unprepare
Date: Mon, 27 Aug 2012 14:55:11 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.02.1208271453510.2079@hadrien> (raw)
In-Reply-To: <CAPDyKFpf+PzMspT7CECpd=ZVdmp=7i4-pr-6StK8N1aRczNryw@mail.gmail.com>
From: Julia Lawall <Julia.Lawall@lip6.fr>
Simplify clock code in probe.
A simplified version of the semantic patch that introduces calls to these
functions is as follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression e;
@@
- clk_prepare(e);
- clk_enable(e);
+ clk_prepare_enable(e);
@@
expression e;
@@
- clk_disable(e);
- clk_unprepare(e);
+ clk_disable_unprepare(e);
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
v2, try to avoid whitespace problem
drivers/mmc/host/mmci.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 50ff19a..edc3e9b 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1309,14 +1309,10 @@ static int __devinit mmci_probe(struct amba_device *dev,
goto host_free;
}
- ret = clk_prepare(host->clk);
+ ret = clk_prepare_enable(host->clk);
if (ret)
goto clk_free;
- ret = clk_enable(host->clk);
- if (ret)
- goto clk_unprep;
-
host->plat = plat;
host->variant = variant;
host->mclk = clk_get_rate(host->clk);
@@ -1515,9 +1511,7 @@ static int __devinit mmci_probe(struct amba_device *dev,
err_gpio_cd:
iounmap(host->base);
clk_disable:
- clk_disable(host->clk);
- clk_unprep:
- clk_unprepare(host->clk);
+ clk_disable_unprepare(host->clk);
clk_free:
clk_put(host->clk);
host_free:
@@ -1564,8 +1558,7 @@ static int __devexit mmci_remove(struct amba_device *dev)
gpio_free(host->gpio_cd);
iounmap(host->base);
- clk_disable(host->clk);
- clk_unprepare(host->clk);
+ clk_disable_unprepare(host->clk);
clk_put(host->clk);
if (host->vcc)
next prev parent reply other threads:[~2012-08-27 12:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-26 16:00 [PATCH 0/13] " Julia Lawall
2012-08-26 16:00 ` [PATCH 1/13] drivers/staging/iio/adc/spear_adc.c: " Julia Lawall
2012-08-27 4:01 ` viresh kumar
2012-08-27 20:06 ` Jonathan Cameron
2012-08-27 20:09 ` Jonathan Cameron
2012-08-26 16:00 ` [PATCH 2/13] drivers/spi/spi-{orion,pl022}.c: " Julia Lawall
2012-08-26 16:00 ` [PATCH 3/13] drivers/gpio/gpio-pxa.c: " Julia Lawall
2012-09-01 4:15 ` Linus Walleij
2012-08-26 16:00 ` [PATCH 4/13] i2c: sirf: " Julia Lawall
2012-08-27 1:44 ` Barry Song
2012-08-26 16:00 ` [PATCH 5/13] arch/arm: " Julia Lawall
2012-08-27 5:57 ` Pankaj Jangra
2012-08-26 16:00 ` [PATCH 6/13] drivers/iio/adc/at91_adc.c: " Julia Lawall
2012-08-27 20:12 ` Jonathan Cameron
2012-08-26 16:00 ` [PATCH 7/13] drivers/mmc/host/mmci.c: " Julia Lawall
2012-08-27 12:33 ` Ulf Hansson
2012-08-27 12:46 ` Julia Lawall
2012-08-27 12:55 ` Julia Lawall [this message]
2012-09-19 5:09 ` Chris Ball
2012-08-26 16:01 ` [PATCH 8/13] i2c: mv64xxx: " Julia Lawall
2012-08-26 16:01 ` [PATCH 9/13] drivers/tty/serial/amba-pl0{10,11}.c: " Julia Lawall
2012-08-26 16:01 ` [PATCH 10/13] drivers/watchdog/sp805_wdt.c: " Julia Lawall
2012-08-27 4:04 ` viresh kumar
2012-08-26 16:01 ` [PATCH 11/13] arch/arm/mach-at91/gpio.c: " Julia Lawall
2012-08-26 16:01 ` [PATCH 12/13] drivers/amba/bus.c: " Julia Lawall
2012-08-26 16:01 ` [PATCH 13/13] drivers/rtc/rtc-coh901331.c: " Julia Lawall
2012-08-28 0:25 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.02.1208271453510.2079@hadrien \
--to=julia.lawall@lip6.fr \
--cc=cjb@laptop.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome