diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-10-04 20:14:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:05:04 -0400 |
commit | 828296debf7853752e47b6abfa608ab0172e53ec (patch) | |
tree | dea1ae8cad35255f5f24bdf8893dab0b003baf49 /drivers/rtc | |
parent | 90829c089ef622e54ce1153eb6dcda9ce98cb7c2 (diff) |
drivers/rtc/rtc-coh901331.c: use clk_prepare_enable() and clk_disable_unprepare()
clk_prepare_enable and clk_disable_unprepare combine clk_prepare and
clk_enable, and clk_disable and clk_unprepare. They 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>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-coh901331.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c index 76b2156d3c62..c8115b83e5ab 100644 --- a/drivers/rtc/rtc-coh901331.c +++ b/drivers/rtc/rtc-coh901331.c | |||
@@ -276,8 +276,7 @@ static void coh901331_shutdown(struct platform_device *pdev) | |||
276 | 276 | ||
277 | clk_enable(rtap->clk); | 277 | clk_enable(rtap->clk); |
278 | writel(0, rtap->virtbase + COH901331_IRQ_MASK); | 278 | writel(0, rtap->virtbase + COH901331_IRQ_MASK); |
279 | clk_disable(rtap->clk); | 279 | clk_disable_unprepare(rtap->clk); |
280 | clk_unprepare(rtap->clk); | ||
281 | } | 280 | } |
282 | 281 | ||
283 | static struct platform_driver coh901331_driver = { | 282 | static struct platform_driver coh901331_driver = { |