| Message ID | 5f1a80d6f88d12b23dbb864e3201fe720cd9bb74.1616395565.git.matti.vaittinen@fi.rohmeurope.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add managed version of delayed work init | expand |
On Mon, Mar 22, 2021 at 09:38:37AM +0200, Matti Vaittinen wrote: > Few drivers implement remove call-back only for ensuring a delayed > work gets cancelled prior driver removal. Clean-up these by switching > to use devm_delayed_work_autocancel() instead. > > This change is compile-tested only. All testing is appreciated. > > Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/retu_wdt.c | 22 ++++++---------------- > 1 file changed, 6 insertions(+), 16 deletions(-) > > diff --git a/drivers/watchdog/retu_wdt.c b/drivers/watchdog/retu_wdt.c > index 258dfcf9cbda..2b9017e1cd91 100644 > --- a/drivers/watchdog/retu_wdt.c > +++ b/drivers/watchdog/retu_wdt.c > @@ -8,6 +8,7 @@ > * Rewritten by Aaro Koskinen. > */ > > +#include <linux/devm-helpers.h> > #include <linux/slab.h> > #include <linux/errno.h> > #include <linux/device.h> > @@ -127,9 +128,12 @@ static int retu_wdt_probe(struct platform_device *pdev) > wdev->rdev = rdev; > wdev->dev = &pdev->dev; > > - INIT_DELAYED_WORK(&wdev->ping_work, retu_wdt_ping_work); > + ret = devm_delayed_work_autocancel(&pdev->dev, &wdev->ping_work, > + retu_wdt_ping_work); > + if (ret) > + return ret; > > - ret = watchdog_register_device(retu_wdt); > + ret = devm_watchdog_register_device(&pdev->dev, retu_wdt); > if (ret < 0) > return ret; > > @@ -138,25 +142,11 @@ static int retu_wdt_probe(struct platform_device *pdev) > else > retu_wdt_ping_enable(wdev); > > - platform_set_drvdata(pdev, retu_wdt); > - > - return 0; > -} > - > -static int retu_wdt_remove(struct platform_device *pdev) > -{ > - struct watchdog_device *wdog = platform_get_drvdata(pdev); > - struct retu_wdt_dev *wdev = watchdog_get_drvdata(wdog); > - > - watchdog_unregister_device(wdog); > - cancel_delayed_work_sync(&wdev->ping_work); > - > return 0; > } > > static struct platform_driver retu_wdt_driver = { > .probe = retu_wdt_probe, > - .remove = retu_wdt_remove, > .driver = { > .name = "retu-wdt", > }, > -- > 2.25.4 > > > -- > Matti Vaittinen, Linux device drivers > ROHM Semiconductors, Finland SWDC > Kiviharjunlenkki 1E > 90220 OULU > FINLAND > > ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~ > Simon says - in Latin please. > ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~ > Thanks to Simon Glass for the translation =]
diff --git a/drivers/watchdog/retu_wdt.c b/drivers/watchdog/retu_wdt.c index 258dfcf9cbda..2b9017e1cd91 100644 --- a/drivers/watchdog/retu_wdt.c +++ b/drivers/watchdog/retu_wdt.c @@ -8,6 +8,7 @@ * Rewritten by Aaro Koskinen. */ +#include <linux/devm-helpers.h> #include <linux/slab.h> #include <linux/errno.h> #include <linux/device.h> @@ -127,9 +128,12 @@ static int retu_wdt_probe(struct platform_device *pdev) wdev->rdev = rdev; wdev->dev = &pdev->dev; - INIT_DELAYED_WORK(&wdev->ping_work, retu_wdt_ping_work); + ret = devm_delayed_work_autocancel(&pdev->dev, &wdev->ping_work, + retu_wdt_ping_work); + if (ret) + return ret; - ret = watchdog_register_device(retu_wdt); + ret = devm_watchdog_register_device(&pdev->dev, retu_wdt); if (ret < 0) return ret; @@ -138,25 +142,11 @@ static int retu_wdt_probe(struct platform_device *pdev) else retu_wdt_ping_enable(wdev); - platform_set_drvdata(pdev, retu_wdt); - - return 0; -} - -static int retu_wdt_remove(struct platform_device *pdev) -{ - struct watchdog_device *wdog = platform_get_drvdata(pdev); - struct retu_wdt_dev *wdev = watchdog_get_drvdata(wdog); - - watchdog_unregister_device(wdog); - cancel_delayed_work_sync(&wdev->ping_work); - return 0; } static struct platform_driver retu_wdt_driver = { .probe = retu_wdt_probe, - .remove = retu_wdt_remove, .driver = { .name = "retu-wdt", },
Few drivers implement remove call-back only for ensuring a delayed work gets cancelled prior driver removal. Clean-up these by switching to use devm_delayed_work_autocancel() instead. This change is compile-tested only. All testing is appreciated. Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> --- drivers/watchdog/retu_wdt.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)