| Message ID | fc14075a0aae06678cde0bae80ec92d93378ac62.1616395565.git.matti.vaittinen@fi.rohmeurope.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Add managed version of delayed work init | expand |
On Mon, Mar 22, 2021 at 09:37:18AM +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/hwmon/raspberrypi-hwmon.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c > index d3a64a35f7a9..805d396aa81b 100644 > --- a/drivers/hwmon/raspberrypi-hwmon.c > +++ b/drivers/hwmon/raspberrypi-hwmon.c > @@ -7,6 +7,7 @@ > * Copyright (C) 2018 Stefan Wahren <stefan.wahren@i2se.com> > */ > #include <linux/device.h> > +#include <linux/devm-helpers.h> > #include <linux/err.h> > #include <linux/hwmon.h> > #include <linux/module.h> > @@ -106,6 +107,7 @@ static int rpi_hwmon_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct rpi_hwmon_data *data; > + int ret; > > data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > if (!data) > @@ -119,7 +121,10 @@ static int rpi_hwmon_probe(struct platform_device *pdev) > &rpi_chip_info, > NULL); > > - INIT_DELAYED_WORK(&data->get_values_poll_work, get_values_poll); > + ret = devm_delayed_work_autocancel(dev, &data->get_values_poll_work, > + get_values_poll); > + if (ret) > + return ret; > platform_set_drvdata(pdev, data); > > if (!PTR_ERR_OR_ZERO(data->hwmon_dev)) > @@ -128,18 +133,8 @@ static int rpi_hwmon_probe(struct platform_device *pdev) > return PTR_ERR_OR_ZERO(data->hwmon_dev); > } > > -static int rpi_hwmon_remove(struct platform_device *pdev) > -{ > - struct rpi_hwmon_data *data = platform_get_drvdata(pdev); > - > - cancel_delayed_work_sync(&data->get_values_poll_work); > - > - return 0; > -} > - > static struct platform_driver rpi_hwmon_driver = { > .probe = rpi_hwmon_probe, > - .remove = rpi_hwmon_remove, > .driver = { > .name = "raspberrypi-hwmon", > }, > -- > 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/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c index d3a64a35f7a9..805d396aa81b 100644 --- a/drivers/hwmon/raspberrypi-hwmon.c +++ b/drivers/hwmon/raspberrypi-hwmon.c @@ -7,6 +7,7 @@ * Copyright (C) 2018 Stefan Wahren <stefan.wahren@i2se.com> */ #include <linux/device.h> +#include <linux/devm-helpers.h> #include <linux/err.h> #include <linux/hwmon.h> #include <linux/module.h> @@ -106,6 +107,7 @@ static int rpi_hwmon_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct rpi_hwmon_data *data; + int ret; data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -119,7 +121,10 @@ static int rpi_hwmon_probe(struct platform_device *pdev) &rpi_chip_info, NULL); - INIT_DELAYED_WORK(&data->get_values_poll_work, get_values_poll); + ret = devm_delayed_work_autocancel(dev, &data->get_values_poll_work, + get_values_poll); + if (ret) + return ret; platform_set_drvdata(pdev, data); if (!PTR_ERR_OR_ZERO(data->hwmon_dev)) @@ -128,18 +133,8 @@ static int rpi_hwmon_probe(struct platform_device *pdev) return PTR_ERR_OR_ZERO(data->hwmon_dev); } -static int rpi_hwmon_remove(struct platform_device *pdev) -{ - struct rpi_hwmon_data *data = platform_get_drvdata(pdev); - - cancel_delayed_work_sync(&data->get_values_poll_work); - - return 0; -} - static struct platform_driver rpi_hwmon_driver = { .probe = rpi_hwmon_probe, - .remove = rpi_hwmon_remove, .driver = { .name = "raspberrypi-hwmon", },
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/hwmon/raspberrypi-hwmon.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)