Bluetooth: hci_bcm: Support platform enumeration

[mirror_ubuntu-bionic-kernel.git] / drivers / watchdog / tegra_wdt.c

diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c
index 2d53c3f9394f2a39bf78175bf4c229c7f3bbab90..9403c08816e35f47e7338938674414953f184f20 100644 (file)
--- a/drivers/watchdog/tegra_wdt.c
+++ b/drivers/watchdog/tegra_wdt.c
@@ -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;