Message ID | 20230307070404.2256308-4-u.kleine-koenig@pengutronix.de (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | watchdog: Simplify using devm_watchdog_register_device() | expand |
On Tue, Mar 07, 2023 at 08:04:04AM +0100, Uwe Kleine-König wrote: > This allows to drop the .remove() function as it only exists to > unregister the watchdog device which is now done in a callback > registered by devm_watchdog_register_device(). > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c index 33c62d51f00a..c82c1b77d91b 100644 --- a/drivers/watchdog/wm8350_wdt.c +++ b/drivers/watchdog/wm8350_wdt.c @@ -153,18 +153,11 @@ static int wm8350_wdt_probe(struct platform_device *pdev) /* Default to 4s timeout */ wm8350_wdt_set_timeout(&wm8350_wdt, 4); - return watchdog_register_device(&wm8350_wdt); -} - -static int wm8350_wdt_remove(struct platform_device *pdev) -{ - watchdog_unregister_device(&wm8350_wdt); - return 0; + return devm_watchdog_register_device(&pdev->dev, &wm8350_wdt); } static struct platform_driver wm8350_wdt_driver = { .probe = wm8350_wdt_probe, - .remove = wm8350_wdt_remove, .driver = { .name = "wm8350-wdt", },