From: Julia Lawall <Julia.Lawall@lip6.fr>
To: Alan Cox <alan@linux.intel.com>
Cc: kernel-janitors@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 9/13] drivers/tty/serial/amba-pl0{10,11}.c: use clk_prepare_enable and clk_disable_unprepare
Date: Sun, 26 Aug 2012 18:01:01 +0200 [thread overview]
Message-ID: <1345996865-32082-10-git-send-email-Julia.Lawall@lip6.fr> (raw)
In-Reply-To: <1345996865-32082-1-git-send-email-Julia.Lawall@lip6.fr>
From: Julia Lawall <Julia.Lawall@lip6.fr>
Clk_prepare_enable and clk_disable_unprepare combine clk_prepare and
clk_enable, and clk_disable and clk_unprepare. The9 make the code more
concise, and ensure that clk_unprepare is called when clk_enable fails.
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>
---
drivers/tty/serial/amba-pl010.c | 15 ++++-----------
drivers/tty/serial/amba-pl011.c | 15 ++++-----------
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c
index 0d91a54..22317dd 100644
--- a/drivers/tty/serial/amba-pl010.c
+++ b/drivers/tty/serial/amba-pl010.c
@@ -312,16 +312,12 @@ static int pl010_startup(struct uart_port *port)
struct uart_amba_port *uap = (struct uart_amba_port *)port;
int retval;
- retval = clk_prepare(uap->clk);
- if (retval)
- goto out;
-
/*
* Try to enable the clock producer.
*/
- retval = clk_enable(uap->clk);
+ retval = clk_prepare_enable(uap->clk);
if (retval)
- goto clk_unprep;
+ goto out;
uap->port.uartclk = clk_get_rate(uap->clk);
@@ -346,9 +342,7 @@ static int pl010_startup(struct uart_port *port)
return 0;
clk_dis:
- clk_disable(uap->clk);
- clk_unprep:
- clk_unprepare(uap->clk);
+ clk_disable_unprepare(uap->clk);
out:
return retval;
}
@@ -375,8 +369,7 @@ static void pl010_shutdown(struct uart_port *port)
/*
* Shut down the clock producer
*/
- clk_disable(uap->clk);
- clk_unprepare(uap->clk);
+ clk_disable_unprepare(uap->clk);
}
static void
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 92b1ac8..3322023 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1324,16 +1324,12 @@ static int pl011_startup(struct uart_port *port)
"could not set default pins\n");
}
- retval = clk_prepare(uap->clk);
- if (retval)
- goto out;
-
/*
* Try to enable the clock producer.
*/
- retval = clk_enable(uap->clk);
+ retval = clk_prepare_enable(uap->clk);
if (retval)
- goto clk_unprep;
+ goto out;
uap->port.uartclk = clk_get_rate(uap->clk);
@@ -1411,9 +1407,7 @@ static int pl011_startup(struct uart_port *port)
return 0;
clk_dis:
- clk_disable(uap->clk);
- clk_unprep:
- clk_unprepare(uap->clk);
+ clk_disable_unprepare(uap->clk);
out:
return retval;
}
@@ -1473,8 +1467,7 @@ static void pl011_shutdown(struct uart_port *port)
/*
* Shut down the clock producer
*/
- clk_disable(uap->clk);
- clk_unprepare(uap->clk);
+ clk_disable_unprepare(uap->clk);
/* Optionally let pins go into sleep states */
if (!IS_ERR(uap->pins_sleep)) {
retval = pinctrl_select_state(uap->pinctrl, uap->pins_sleep);
next prev parent reply other threads:[~2012-08-26 16:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-26 16:00 [PATCH 0/13] use clk_prepare_enable and clk_disable_unprepare 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
2012-09-19 5:09 ` Chris Ball
2012-08-26 16:01 ` [PATCH 8/13] i2c: mv64xxx: " Julia Lawall
2012-08-26 16:01 ` Julia Lawall [this message]
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=1345996865-32082-10-git-send-email-Julia.Lawall@lip6.fr \
--to=julia.lawall@lip6.fr \
--cc=alan@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).