summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-04-16 11:35:50 +0200
committerWim Van Sebroeck <wim@iguana.be>2014-06-10 21:41:36 +0200
commitb4e62d9467cc5c69d7a23ebc50382c01b769e933 (patch)
treefd0187d5864f747dd6be5b49bf8165bfa747214c /drivers/watchdog
parent23afeb613ec0e10aecfae7838a14d485db62ac52 (diff)
downloadop-kernel-dev-b4e62d9467cc5c69d7a23ebc50382c01b769e933.zip
op-kernel-dev-b4e62d9467cc5c69d7a23ebc50382c01b769e933.tar.gz
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 0e67d96..41ac466 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)
if (IS_ERR(wdt_clk))
return PTR_ERR(wdt_clk);
- err = clk_enable(wdt_clk);
+ err = clk_prepare_enable(wdt_clk);
if (err)
return err;
@@ -296,14 +296,14 @@ static int ath79_wdt_probe(struct platform_device *pdev)
return 0;
err_clk_disable:
- clk_disable(wdt_clk);
+ clk_disable_unprepare(wdt_clk);
return err;
}
static int ath79_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&ath79_wdt_miscdev);
- clk_disable(wdt_clk);
+ clk_disable_unprepare(wdt_clk);
return 0;
}
OpenPOWER on IntegriCloud