| Message ID | 20230918085951.1234172-3-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: Convert to platform remove callback returning void | expand |
Hi, On 9/18/23 10:59, Uwe Kleine-König wrote: > The .remove() callback for a platform driver returns an int which makes > many driver authors wrongly assume it's possible to do error handling by > returning an error code. However the value returned is ignored (apart > from emitting a warning) and this typically results in resource leaks. > To improve here there is a quest to make the remove callback return > void. In the first step of this quest all drivers are converted to > .remove_new() which already returns void. Eventually after all drivers > are converted, .remove_new() is renamed to .remove(). > > Trivially convert this driver from always returning zero in the remove > callback to the void returning variant. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/hwmon/abituguru.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c > index a7cae6568155..93653ea05430 100644 > --- a/drivers/hwmon/abituguru.c > +++ b/drivers/hwmon/abituguru.c > @@ -1428,7 +1428,7 @@ static int abituguru_probe(struct platform_device *pdev) > return res; > } > > -static int abituguru_remove(struct platform_device *pdev) > +static void abituguru_remove(struct platform_device *pdev) > { > int i; > struct abituguru_data *data = platform_get_drvdata(pdev); > @@ -1439,8 +1439,6 @@ static int abituguru_remove(struct platform_device *pdev) > for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) > device_remove_file(&pdev->dev, > &abituguru_sysfs_attr[i].dev_attr); > - > - return 0; > } > > static struct abituguru_data *abituguru_update_device(struct device *dev) > @@ -1533,7 +1531,7 @@ static struct platform_driver abituguru_driver = { > .pm = pm_sleep_ptr(&abituguru_pm), > }, > .probe = abituguru_probe, > - .remove = abituguru_remove, > + .remove_new = abituguru_remove, > }; > > static int __init abituguru_detect(void)
diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c index a7cae6568155..93653ea05430 100644 --- a/drivers/hwmon/abituguru.c +++ b/drivers/hwmon/abituguru.c @@ -1428,7 +1428,7 @@ static int abituguru_probe(struct platform_device *pdev) return res; } -static int abituguru_remove(struct platform_device *pdev) +static void abituguru_remove(struct platform_device *pdev) { int i; struct abituguru_data *data = platform_get_drvdata(pdev); @@ -1439,8 +1439,6 @@ static int abituguru_remove(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++) device_remove_file(&pdev->dev, &abituguru_sysfs_attr[i].dev_attr); - - return 0; } static struct abituguru_data *abituguru_update_device(struct device *dev) @@ -1533,7 +1531,7 @@ static struct platform_driver abituguru_driver = { .pm = pm_sleep_ptr(&abituguru_pm), }, .probe = abituguru_probe, - .remove = abituguru_remove, + .remove_new = abituguru_remove, }; static int __init abituguru_detect(void)
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Eventually after all drivers are converted, .remove_new() is renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/hwmon/abituguru.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)