forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
23afeb613e
commit
b4e62d9467
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user