watchdog: mtk_wdt: Convert to use device managed functions and other improvements

Use device managed functions to simplify error handling, reduce
source code size, improve readability, and reduce the likelyhood of bugs.
Other improvements as listed below.

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

- Drop assignments to otherwise unused variables
- Drop empty remove function
- Introduce local variable 'struct device *dev' and use it instead of
  dereferencing it repeatedly
- Use devm_watchdog_register_driver() to register watchdog device
- Replace shutdown function with call to watchdog_stop_on_reboot()

Cc: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 113a48d54058a544dbb22b9e35dfe7405f252192..9c3d0033260d9665d5f72fd5f8b25b3cf1475681 100644 (file)
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -153,10 +153,11 @@ static const struct watchdog_ops mtk_wdt_ops = {
 
 static int mtk_wdt_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        struct mtk_wdt_dev *mtk_wdt;
        int err;
 
-       mtk_wdt = devm_kzalloc(&pdev->dev, sizeof(*mtk_wdt), GFP_KERNEL);
+       mtk_wdt = devm_kzalloc(dev, sizeof(*mtk_wdt), GFP_KERNEL);
        if (!mtk_wdt)
                return -ENOMEM;
 
@@ -171,9 +172,9 @@ static int mtk_wdt_probe(struct platform_device *pdev)
        mtk_wdt->wdt_dev.timeout = WDT_MAX_TIMEOUT;
        mtk_wdt->wdt_dev.max_timeout = WDT_MAX_TIMEOUT;
        mtk_wdt->wdt_dev.min_timeout = WDT_MIN_TIMEOUT;
-       mtk_wdt->wdt_dev.parent = &pdev->dev;
+       mtk_wdt->wdt_dev.parent = dev;
 
-       watchdog_init_timeout(&mtk_wdt->wdt_dev, timeout, &pdev->dev);
+       watchdog_init_timeout(&mtk_wdt->wdt_dev, timeout, dev);
        watchdog_set_nowayout(&mtk_wdt->wdt_dev, nowayout);
        watchdog_set_restart_priority(&mtk_wdt->wdt_dev, 128);
 
@@ -181,29 +182,13 @@ static int mtk_wdt_probe(struct platform_device *pdev)
 
        mtk_wdt_stop(&mtk_wdt->wdt_dev);
 
-       err = watchdog_register_device(&mtk_wdt->wdt_dev);
+       watchdog_stop_on_reboot(&mtk_wdt->wdt_dev);
+       err = devm_watchdog_register_device(dev, &mtk_wdt->wdt_dev);
        if (unlikely(err))
                return err;
 
-       dev_info(&pdev->dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)\n",
-                       mtk_wdt->wdt_dev.timeout, nowayout);
-
-       return 0;
-}
-
-static void mtk_wdt_shutdown(struct platform_device *pdev)
-{
-       struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
-
-       if (watchdog_active(&mtk_wdt->wdt_dev))
-               mtk_wdt_stop(&mtk_wdt->wdt_dev);
-}
-
-static int mtk_wdt_remove(struct platform_device *pdev)
-{
-       struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
-
-       watchdog_unregister_device(&mtk_wdt->wdt_dev);
+       dev_info(dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)\n",
+                mtk_wdt->wdt_dev.timeout, nowayout);
 
        return 0;
 }
@@ -245,8 +230,6 @@ static const struct dev_pm_ops mtk_wdt_pm_ops = {
 
 static struct platform_driver mtk_wdt_driver = {
        .probe          = mtk_wdt_probe,
-       .remove         = mtk_wdt_remove,
-       .shutdown       = mtk_wdt_shutdown,
        .driver         = {
                .name           = DRV_NAME,
                .pm             = &mtk_wdt_pm_ops,