watchdog: stmp3xxx_rtc_wdt: Convert to use device managed functions

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

diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c
index 994c54c..671f4ba 100644 (file)
--- a/drivers/watchdog/stmp3xxx_rtc_wdt.c
+++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c
@@ -89,31 +89,31 @@ static struct notifier_block wdt_notifier = {
 
 static int stmp3xxx_wdt_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        int ret;
 
-       watchdog_set_drvdata(&stmp3xxx_wdd, &pdev->dev);
+       watchdog_set_drvdata(&stmp3xxx_wdd, dev);
 
        stmp3xxx_wdd.timeout = clamp_t(unsigned, heartbeat, 1, STMP3XXX_MAX_TIMEOUT);
-       stmp3xxx_wdd.parent = &pdev->dev;
+       stmp3xxx_wdd.parent = dev;
 
-       ret = watchdog_register_device(&stmp3xxx_wdd);
+       ret = devm_watchdog_register_device(dev, &stmp3xxx_wdd);
        if (ret < 0) {
-               dev_err(&pdev->dev, "cannot register watchdog device\n");
+               dev_err(dev, "cannot register watchdog device\n");
                return ret;
        }
 
        if (register_reboot_notifier(&wdt_notifier))
-               dev_warn(&pdev->dev, "cannot register reboot notifier\n");
+               dev_warn(dev, "cannot register reboot notifier\n");
 
-       dev_info(&pdev->dev, "initialized watchdog with heartbeat %ds\n",
-                       stmp3xxx_wdd.timeout);
+       dev_info(dev, "initialized watchdog with heartbeat %ds\n",
+                stmp3xxx_wdd.timeout);
        return 0;
 }
 
 static int stmp3xxx_wdt_remove(struct platform_device *pdev)
 {
        unregister_reboot_notifier(&wdt_notifier);
-       watchdog_unregister_device(&stmp3xxx_wdd);
        return 0;
 }