]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchdog: tegra_wdt: Convert to use device managed functions
authorGuenter Roeck <linux@roeck-us.net>
Wed, 11 Jan 2017 02:09:11 +0000 (18:09 -0800)
committerGuenter Roeck <linux@roeck-us.net>
Fri, 24 Feb 2017 22:00:23 +0000 (14:00 -0800)
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

- Use devm_watchdog_register_driver() to register watchdog device

Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/watchdog/tegra_wdt.c

index 2d53c3f9394f2a39bf78175bf4c229c7f3bbab90..9403c08816e35f47e7338938674414953f184f20 100644 (file)
@@ -226,7 +226,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
 
        watchdog_set_nowayout(wdd, nowayout);
 
-       ret = watchdog_register_device(wdd);
+       ret = devm_watchdog_register_device(&pdev->dev, wdd);
        if (ret) {
                dev_err(&pdev->dev,
                        "failed to register watchdog device\n");
@@ -248,8 +248,6 @@ static int tegra_wdt_remove(struct platform_device *pdev)
 
        tegra_wdt_stop(&wdt->wdd);
 
-       watchdog_unregister_device(&wdt->wdd);
-
        dev_info(&pdev->dev, "removed wdt\n");
 
        return 0;