watchdog: tegra_wdt: Use watchdog_stop_on_unregister and other improvements

[linux-2.6-microblaze.git] / drivers / watchdog / tegra_wdt.c

diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c
index fc3cf5e..a58b000 100644 (file)
--- a/drivers/watchdog/tegra_wdt.c
+++ b/drivers/watchdog/tegra_wdt.c
@@ -181,6 +181,7 @@ static const struct watchdog_ops tegra_wdt_ops = {
 
 static int tegra_wdt_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        struct watchdog_device *wdd;
        struct tegra_wdt *wdt;
        void __iomem *regs;
@@ -195,7 +196,7 @@ static int tegra_wdt_probe(struct platform_device *pdev)
         * Allocate our watchdog driver data, which has the
         * struct watchdog_device nested within it.
         */
-       wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
+       wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
        if (!wdt)
                return -ENOMEM;
 
@@ -210,39 +211,27 @@ static int tegra_wdt_probe(struct platform_device *pdev)
        wdd->ops = &tegra_wdt_ops;
        wdd->min_timeout = MIN_WDT_TIMEOUT;
        wdd->max_timeout = MAX_WDT_TIMEOUT;
-       wdd->parent = &pdev->dev;
+       wdd->parent = dev;
 
        watchdog_set_drvdata(wdd, wdt);
 
        watchdog_set_nowayout(wdd, nowayout);
 
-       ret = devm_watchdog_register_device(&pdev->dev, wdd);
+       watchdog_stop_on_unregister(wdd);
+       ret = devm_watchdog_register_device(dev, wdd);
        if (ret) {
-               dev_err(&pdev->dev,
-                       "failed to register watchdog device\n");
+               dev_err(dev, "failed to register watchdog device\n");
                return ret;
        }
 
        platform_set_drvdata(pdev, wdt);
 
-       dev_info(&pdev->dev,
-                "initialized (heartbeat = %d sec, nowayout = %d)\n",
+       dev_info(dev, "initialized (heartbeat = %d sec, nowayout = %d)\n",
                 heartbeat, nowayout);
 
        return 0;
 }
 
-static int tegra_wdt_remove(struct platform_device *pdev)
-{
-       struct tegra_wdt *wdt = platform_get_drvdata(pdev);
-
-       tegra_wdt_stop(&wdt->wdd);
-
-       dev_info(&pdev->dev, "removed wdt\n");
-
-       return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int tegra_wdt_runtime_suspend(struct device *dev)
 {
@@ -278,7 +267,6 @@ static const struct dev_pm_ops tegra_wdt_pm_ops = {
 
 static struct platform_driver tegra_wdt_driver = {
        .probe          = tegra_wdt_probe,
-       .remove         = tegra_wdt_remove,
        .driver         = {
                .name   = "tegra-wdt",
                .pm     = &tegra_wdt_pm_ops,