mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
watchdog: da9063_wdt: Convert to use device managed functions
Use device managed functions to simplify error handling, reduce source code size, improve readability, and reduce the likelyhood of bugs. The conversion was done automatically with coccinelle using the following semantic patches. The semantic patches and the scripts used to generate this commit log are available at https://github.com/groeck/coccinelle-patches - Replace 'val = e; return val;' with 'return e;' - Replace 'if (e) return e; return 0;' with 'return e;' - Drop assignments to otherwise unused variables - Drop unused variables - Drop remove function - Drop dev_set_drvdata() - Use devm_watchdog_register_driver() to register watchdog device Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
528eff34dd
commit
64b849e28b
@ -151,7 +151,6 @@ static const struct watchdog_ops da9063_watchdog_ops = {
|
||||
|
||||
static int da9063_wdt_probe(struct platform_device *pdev)
|
||||
{
|
||||
int ret;
|
||||
struct da9063 *da9063;
|
||||
struct da9063_watchdog *wdt;
|
||||
|
||||
@ -181,27 +180,12 @@ static int da9063_wdt_probe(struct platform_device *pdev)
|
||||
watchdog_set_restart_priority(&wdt->wdtdev, 128);
|
||||
|
||||
watchdog_set_drvdata(&wdt->wdtdev, wdt);
|
||||
dev_set_drvdata(&pdev->dev, wdt);
|
||||
|
||||
ret = watchdog_register_device(&wdt->wdtdev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int da9063_wdt_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct da9063_watchdog *wdt = dev_get_drvdata(&pdev->dev);
|
||||
|
||||
watchdog_unregister_device(&wdt->wdtdev);
|
||||
|
||||
return 0;
|
||||
return devm_watchdog_register_device(&pdev->dev, &wdt->wdtdev);
|
||||
}
|
||||
|
||||
static struct platform_driver da9063_wdt_driver = {
|
||||
.probe = da9063_wdt_probe,
|
||||
.remove = da9063_wdt_remove,
|
||||
.driver = {
|
||||
.name = DA9063_DRVNAME_WATCHDOG,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user