diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2014-04-16 05:35:50 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2014-06-10 15:41:36 -0400 |
commit | b4e62d9467cc5c69d7a23ebc50382c01b769e933 (patch) | |
tree | fd0187d5864f747dd6be5b49bf8165bfa747214c /drivers/watchdog | |
parent | 23afeb613ec0e10aecfae7838a14d485db62ac52 (diff) |
watchdog: ath79_wdt: switch to clk_prepare/clk_disable
Replace clk_enable() and clk_disable() calls with
clk_prepare_enable() and clk_disable_unprepare()
to get ready for the migration to the common clock
framework.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/ath79_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c index 0e67d96b3ebd..41ac4660fb89 100644 --- a/drivers/watchdog/ath79_wdt.c +++ b/drivers/watchdog/ath79_wdt.c | |||
@@ -265,7 +265,7 @@ static int ath79_wdt_probe(struct platform_device *pdev) | |||
265 | if (IS_ERR(wdt_clk)) | 265 | if (IS_ERR(wdt_clk)) |
266 | return PTR_ERR(wdt_clk); | 266 | return PTR_ERR(wdt_clk); |
267 | 267 | ||
268 | err = clk_enable(wdt_clk); | 268 | err = clk_prepare_enable(wdt_clk); |
269 | if (err) | 269 | if (err) |
270 | return err; | 270 | return err; |
271 | 271 | ||
@@ -296,14 +296,14 @@ static int ath79_wdt_probe(struct platform_device *pdev) | |||
296 | return 0; | 296 | return 0; |
297 | 297 | ||
298 | err_clk_disable: | 298 | err_clk_disable: |
299 | clk_disable(wdt_clk); | 299 | clk_disable_unprepare(wdt_clk); |
300 | return err; | 300 | return err; |
301 | } | 301 | } |
302 | 302 | ||
303 | static int ath79_wdt_remove(struct platform_device *pdev) | 303 | static int ath79_wdt_remove(struct platform_device *pdev) |
304 | { | 304 | { |
305 | misc_deregister(&ath79_wdt_miscdev); | 305 | misc_deregister(&ath79_wdt_miscdev); |
306 | clk_disable(wdt_clk); | 306 | clk_disable_unprepare(wdt_clk); |
307 | return 0; | 307 | return 0; |
308 | } | 308 | } |
309 | 309 | ||