redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

watchdog: shwdt: use devm_clk_get()

Browse source 
Use devm_clk_get() to make cleanup paths more simple.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Jingoo Han 2013-04-29 18:16:33 +09:00 committed by Wim Van Sebroeck
parent 259181feb0
commit 2f7b9b4883
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/watchdog/shwdt.c
View file

@ -241,7 +241,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
wdt->dev = &pdev->dev;
wdt->clk = clk_get(&pdev->dev, NULL);
wdt->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(wdt->clk)) {
/*
* Clock framework support is optional, continue on
@ -251,10 +251,8 @@ static int sh_wdt_probe(struct platform_device *pdev)
}
wdt->base = devm_ioremap_resource(wdt->dev, res);
if (IS_ERR(wdt->base)) {
rc = PTR_ERR(wdt->base);
goto err;
}
if (IS_ERR(wdt->base))
return PTR_ERR(wdt->base);
watchdog_set_nowayout(&sh_wdt_dev, nowayout);
watchdog_set_drvdata(&sh_wdt_dev, wdt);
@ -277,7 +275,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
rc = watchdog_register_device(&sh_wdt_dev);
if (unlikely(rc)) {
dev_err(&pdev->dev, "Can't register watchdog (err=%d)\n", rc);
goto err;
return rc;
}
init_timer(&wdt->timer);
@ -292,11 +290,6 @@ static int sh_wdt_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
return 0;
err:
clk_put(wdt->clk);
return rc;
}
static int sh_wdt_remove(struct platform_device *pdev)
@ -308,7 +301,6 @@ static int sh_wdt_remove(struct platform_device *pdev)
watchdog_unregister_device(&sh_wdt_dev);
pm_runtime_disable(&pdev->dev);
clk_put(wdt->clk);
return 0;
}