diff options
author | Thomas Abraham <thomas.abraham@linaro.org> | 2013-04-29 19:20:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:35 -0400 |
commit | 1a3224f141365baab8861d0852ac134bd1d6877b (patch) | |
tree | e6771cdbbb1e9d148fb01cd49206e130e226707e /drivers/rtc | |
parent | e005715efaf674660ae59af83b13822567e3a758 (diff) |
drivers/rtc/rtc-s3c.c: use clk_prepare_enable and clk_disable_unprepare
Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
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-s3c.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index 653a4dcbfe7d..8e96c00936be 100644 --- 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) | |||
426 | 426 | ||
427 | s3c_rtc_setaie(&dev->dev, 0); | 427 | s3c_rtc_setaie(&dev->dev, 0); |
428 | 428 | ||
429 | clk_unprepare(rtc_clk); | ||
429 | rtc_clk = NULL; | 430 | rtc_clk = NULL; |
430 | 431 | ||
431 | return 0; | 432 | return 0; |
@@ -494,7 +495,7 @@ static int s3c_rtc_probe(struct platform_device *pdev) | |||
494 | return ret; | 495 | return ret; |
495 | } | 496 | } |
496 | 497 | ||
497 | clk_enable(rtc_clk); | 498 | clk_prepare_enable(rtc_clk); |
498 | 499 | ||
499 | /* check to see if everything is setup correctly */ | 500 | /* check to see if everything is setup correctly */ |
500 | 501 | ||
@@ -573,7 +574,7 @@ static int s3c_rtc_probe(struct platform_device *pdev) | |||
573 | 574 | ||
574 | err_nortc: | 575 | err_nortc: |
575 | s3c_rtc_enable(pdev, 0); | 576 | s3c_rtc_enable(pdev, 0); |
576 | clk_disable(rtc_clk); | 577 | clk_disable_unprepare(rtc_clk); |
577 | 578 | ||
578 | return ret; | 579 | return ret; |
579 | } | 580 | } |