projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e005715
)
drivers/rtc/rtc-s3c.c: use clk_prepare_enable and clk_disable_unprepare
author
Thomas Abraham
<
[email protected]
>
Mon, 29 Apr 2013 23:20:24 +0000
(16:20 -0700)
committer
Linus Torvalds
<
[email protected]
>
Tue, 30 Apr 2013 01:28:35 +0000
(18:28 -0700)
Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.
Signed-off-by: Thomas Abraham <
[email protected]
>
Signed-off-by: Vivek Gautam <
[email protected]
>
Reviewed-by: Sylwester Nawrocki <
[email protected]
>
Reviewed-by: Jingoo Han <
[email protected]
>
Acked-by: Kukjin Kim <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/rtc/rtc-s3c.c
patch
|
blob
|
history
diff --git
a/drivers/rtc/rtc-s3c.c
b/drivers/rtc/rtc-s3c.c
index 653a4dcbfe7d456d8b10c100c3f79b1cf7e97858..8e96c00936be7805f234f8c8d6d3d91bfc2d2223 100644
(file)
--- a/
drivers/rtc/rtc-s3c.c
+++ b/
drivers/rtc/rtc-s3c.c
@@
-426,6
+426,7
@@
static int s3c_rtc_remove(struct platform_device *dev)
s3c_rtc_setaie(&dev->dev, 0);
+ clk_unprepare(rtc_clk);
rtc_clk = NULL;
return 0;
@@
-494,7
+495,7
@@
static int s3c_rtc_probe(struct platform_device *pdev)
return ret;
}
- clk_enable(rtc_clk);
+ clk_
prepare_
enable(rtc_clk);
/* check to see if everything is setup correctly */
@@
-573,7
+574,7
@@
static int s3c_rtc_probe(struct platform_device *pdev)
err_nortc:
s3c_rtc_enable(pdev, 0);
- clk_disable(rtc_clk);
+ clk_disable
_unprepare
(rtc_clk);
return ret;
}