watchdog: da9055_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 'goto l; ... l: return e;' with 'return e;'
- Drop assignments to otherwise unused variables
- Drop remove function
- Drop platform_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>

diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c
index 4f30818cf93f84f45970bbf17c731a68660042c5..50bdd10221864994a771b868acd98c07fc398528 100644 (file)
--- a/drivers/watchdog/da9055_wdt.c
+++ b/drivers/watchdog/da9055_wdt.c
@@ -147,32 +147,19 @@ static int da9055_wdt_probe(struct platform_device *pdev)
        ret = da9055_wdt_stop(da9055_wdt);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to stop watchdog, %d\n", ret);
-               goto err;
+               return ret;
        }
 
-       platform_set_drvdata(pdev, driver_data);
-
-       ret = watchdog_register_device(&driver_data->wdt);
+       ret = devm_watchdog_register_device(&pdev->dev, &driver_data->wdt);
        if (ret != 0)
                dev_err(da9055->dev, "watchdog_register_device() failed: %d\n",
                        ret);
 
-err:
        return ret;
 }
 
-static int da9055_wdt_remove(struct platform_device *pdev)
-{
-       struct da9055_wdt_data *driver_data = platform_get_drvdata(pdev);
-
-       watchdog_unregister_device(&driver_data->wdt);
-
-       return 0;
-}
-
 static struct platform_driver da9055_wdt_driver = {
        .probe = da9055_wdt_probe,
-       .remove = da9055_wdt_remove,
        .driver = {
                .name   = "da9055-watchdog",
        },