watchdog: cadence_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
- Use devm_add_action_or_reset() for calls to clk_disable_unprepare
- Replace 'goto l; ... l: return e;' with 'return e;'
- Replace 'val = e; return val;' with 'return e;'
- 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()

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c
index 5986f18f97e24f69545fea237f1a55c38b7c6e3f..c5051907df0065d0f148c9c75766b5ba75ccaa4f 100644 (file)
--- a/drivers/watchdog/cadence_wdt.c
+++ b/drivers/watchdog/cadence_wdt.c
@@ -274,6 +274,11 @@ static const struct watchdog_ops cdns_wdt_ops = {
        .set_timeout = cdns_wdt_settimeout,
 };
 
+static void cdns_clk_disable_unprepare(void *data)
+{
+       clk_disable_unprepare(data);
+}
+
 /************************Platform Operations*****************************/
 /**
  * cdns_wdt_probe - Probe call for the device.
@@ -285,12 +290,13 @@ static const struct watchdog_ops cdns_wdt_ops = {
  */
 static int cdns_wdt_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        int ret, irq;
        unsigned long clock_f;
        struct cdns_wdt *wdt;
        struct watchdog_device *cdns_wdt_device;
 
-       wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
+       wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
        if (!wdt)
                return -ENOMEM;
 
@@ -306,13 +312,13 @@ static int cdns_wdt_probe(struct platform_device *pdev)
                return PTR_ERR(wdt->regs);
 
        /* Register the interrupt */
-       wdt->rst = of_property_read_bool(pdev->dev.of_node, "reset-on-timeout");
+       wdt->rst = of_property_read_bool(dev->of_node, "reset-on-timeout");
        irq = platform_get_irq(pdev, 0);
        if (!wdt->rst && irq >= 0) {
-               ret = devm_request_irq(&pdev->dev, irq, cdns_wdt_irq_handler, 0,
+               ret = devm_request_irq(dev, irq, cdns_wdt_irq_handler, 0,
                                       pdev->name, pdev);
                if (ret) {
-                       dev_err(&pdev->dev,
+                       dev_err(dev,
                                "cannot register interrupt handler err=%d\n",
                                ret);
                        return ret;
@@ -320,11 +326,11 @@ static int cdns_wdt_probe(struct platform_device *pdev)
        }
 
        /* Initialize the members of cdns_wdt structure */
-       cdns_wdt_device->parent = &pdev->dev;
+       cdns_wdt_device->parent = dev;
 
-       ret = watchdog_init_timeout(cdns_wdt_device, wdt_timeout, &pdev->dev);
+       ret = watchdog_init_timeout(cdns_wdt_device, wdt_timeout, dev);
        if (ret) {
-               dev_err(&pdev->dev, "unable to set timeout value\n");
+               dev_err(dev, "unable to set timeout value\n");
                return ret;
        }
 
@@ -332,18 +338,21 @@ static int cdns_wdt_probe(struct platform_device *pdev)
        watchdog_stop_on_reboot(cdns_wdt_device);
        watchdog_set_drvdata(cdns_wdt_device, wdt);
 
-       wdt->clk = devm_clk_get(&pdev->dev, NULL);
+       wdt->clk = devm_clk_get(dev, NULL);
        if (IS_ERR(wdt->clk)) {
-               dev_err(&pdev->dev, "input clock not found\n");
-               ret = PTR_ERR(wdt->clk);
-               return ret;
+               dev_err(dev, "input clock not found\n");
+               return PTR_ERR(wdt->clk);
        }
 
        ret = clk_prepare_enable(wdt->clk);
        if (ret) {
-               dev_err(&pdev->dev, "unable to enable clock\n");
+               dev_err(dev, "unable to enable clock\n");
                return ret;
        }
+       ret = devm_add_action_or_reset(dev, cdns_clk_disable_unprepare,
+                                      wdt->clk);
+       if (ret)
+               return ret;
 
        clock_f = clk_get_rate(wdt->clk);
        if (clock_f <= CDNS_WDT_CLK_75MHZ) {
@@ -356,56 +365,20 @@ static int cdns_wdt_probe(struct platform_device *pdev)
 
        spin_lock_init(&wdt->io_lock);
 
-       ret = watchdog_register_device(cdns_wdt_device);
+       watchdog_stop_on_reboot(cdns_wdt_device);
+       watchdog_stop_on_unregister(cdns_wdt_device);
+       ret = devm_watchdog_register_device(dev, cdns_wdt_device);
        if (ret) {
-               dev_err(&pdev->dev, "Failed to register wdt device\n");
-               goto err_clk_disable;
+               dev_err(dev, "Failed to register wdt device\n");
+               return ret;
        }
        platform_set_drvdata(pdev, wdt);
 
-       dev_info(&pdev->dev, "Xilinx Watchdog Timer at %p with timeout %ds%s\n",
+       dev_info(dev, "Xilinx Watchdog Timer at %p with timeout %ds%s\n",
                 wdt->regs, cdns_wdt_device->timeout,
                 nowayout ? ", nowayout" : "");
 
        return 0;
-
-err_clk_disable:
-       clk_disable_unprepare(wdt->clk);
-
-       return ret;
-}
-
-/**
- * cdns_wdt_remove - Probe call for the device.
- *
- * @pdev: handle to the platform device structure.
- * Return: 0 on success, otherwise negative error.
- *
- * Unregister the device after releasing the resources.
- */
-static int cdns_wdt_remove(struct platform_device *pdev)
-{
-       struct cdns_wdt *wdt = platform_get_drvdata(pdev);
-
-       cdns_wdt_stop(&wdt->cdns_wdt_device);
-       watchdog_unregister_device(&wdt->cdns_wdt_device);
-       clk_disable_unprepare(wdt->clk);
-
-       return 0;
-}
-
-/**
- * cdns_wdt_shutdown - Stop the device.
- *
- * @pdev: handle to the platform structure.
- *
- */
-static void cdns_wdt_shutdown(struct platform_device *pdev)
-{
-       struct cdns_wdt *wdt = platform_get_drvdata(pdev);
-
-       cdns_wdt_stop(&wdt->cdns_wdt_device);
-       clk_disable_unprepare(wdt->clk);
 }
 
 /**
@@ -460,8 +433,6 @@ MODULE_DEVICE_TABLE(of, cdns_wdt_of_match);
 /* Driver Structure */
 static struct platform_driver cdns_wdt_driver = {
        .probe          = cdns_wdt_probe,
-       .remove         = cdns_wdt_remove,
-       .shutdown       = cdns_wdt_shutdown,
        .driver         = {
                .name   = "cdns-wdt",
                .of_match_table = cdns_wdt_of_match,