Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-block.git] / drivers / watchdog / bcm47xx_wdt.c

diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
index 05425c1dfd4c7c639f07d19d3a3d490d6f404c1c..06a54c7de40babb9219165dcdc825ebe4111f758 100644 (file)
--- a/drivers/watchdog/bcm47xx_wdt.c
+++ b/drivers/watchdog/bcm47xx_wdt.c
@@ -202,7 +202,7 @@ static int bcm47xx_wdt_probe(struct platform_device *pdev)
        watchdog_set_restart_priority(&wdt->wdd, 64);
        watchdog_stop_on_reboot(&wdt->wdd);
 
-       ret = watchdog_register_device(&wdt->wdd);
+       ret = devm_watchdog_register_device(&pdev->dev, &wdt->wdd);
        if (ret)
                goto err_timer;
 
@@ -218,21 +218,11 @@ err_timer:
        return ret;
 }
 
-static int bcm47xx_wdt_remove(struct platform_device *pdev)
-{
-       struct bcm47xx_wdt *wdt = dev_get_platdata(&pdev->dev);
-
-       watchdog_unregister_device(&wdt->wdd);
-
-       return 0;
-}
-
 static struct platform_driver bcm47xx_wdt_driver = {
        .driver         = {
                .name   = "bcm47xx-wdt",
        },
        .probe          = bcm47xx_wdt_probe,
-       .remove         = bcm47xx_wdt_remove,
 };
 
 module_platform_driver(bcm47xx_wdt_driver);