watchdog: ath79_wdt: convert to use devm_clk_get
Use the managed version of clk_get. This allows to simplify the probe/remove functions a bit. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
parent
41adafbd7b
commit
5071a88475
1 changed files with 2 additions and 5 deletions
|
@ -229,13 +229,13 @@ static int ath79_wdt_probe(struct platform_device *pdev)
|
||||||
u32 ctrl;
|
u32 ctrl;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
wdt_clk = clk_get(&pdev->dev, "wdt");
|
wdt_clk = devm_clk_get(&pdev->dev, "wdt");
|
||||||
if (IS_ERR(wdt_clk))
|
if (IS_ERR(wdt_clk))
|
||||||
return PTR_ERR(wdt_clk);
|
return PTR_ERR(wdt_clk);
|
||||||
|
|
||||||
err = clk_enable(wdt_clk);
|
err = clk_enable(wdt_clk);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_clk_put;
|
return err;
|
||||||
|
|
||||||
wdt_freq = clk_get_rate(wdt_clk);
|
wdt_freq = clk_get_rate(wdt_clk);
|
||||||
if (!wdt_freq) {
|
if (!wdt_freq) {
|
||||||
|
@ -265,8 +265,6 @@ static int ath79_wdt_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
err_clk_disable:
|
err_clk_disable:
|
||||||
clk_disable(wdt_clk);
|
clk_disable(wdt_clk);
|
||||||
err_clk_put:
|
|
||||||
clk_put(wdt_clk);
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -274,7 +272,6 @@ static int ath79_wdt_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
misc_deregister(&ath79_wdt_miscdev);
|
misc_deregister(&ath79_wdt_miscdev);
|
||||||
clk_disable(wdt_clk);
|
clk_disable(wdt_clk);
|
||||||
clk_put(wdt_clk);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue