| Message ID | 20230517230239.187727-86-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e0d53e4f7fd84cb41ece77c3f02c18699cc82736 |
| Headers | show |
| Series | usb: Convert to platform remove callback returning void | expand |
Hey Uwe, Thanks for the patch. Uwe Kleine-König <u.kleine-koenig@pengutronix.de> writes: > 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> LGTM Acked-by: Rui Miguel Silva <rui.silva@linaro.org> Cheers, Rui > --- > drivers/usb/isp1760/isp1760-if.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c > index 65ba5aca2a4f..fe1e3985419a 100644 > --- a/drivers/usb/isp1760/isp1760-if.c > +++ b/drivers/usb/isp1760/isp1760-if.c > @@ -246,11 +246,9 @@ static int isp1760_plat_probe(struct platform_device *pdev) > return 0; > } > > -static int isp1760_plat_remove(struct platform_device *pdev) > +static void isp1760_plat_remove(struct platform_device *pdev) > { > isp1760_unregister(&pdev->dev); > - > - return 0; > } > > #ifdef CONFIG_OF > @@ -265,7 +263,7 @@ MODULE_DEVICE_TABLE(of, isp1760_of_match); > > static struct platform_driver isp1760_plat_driver = { > .probe = isp1760_plat_probe, > - .remove = isp1760_plat_remove, > + .remove_new = isp1760_plat_remove, > .driver = { > .name = "isp1760", > .of_match_table = of_match_ptr(isp1760_of_match), > -- > 2.39.2
diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c index 65ba5aca2a4f..fe1e3985419a 100644 --- a/drivers/usb/isp1760/isp1760-if.c +++ b/drivers/usb/isp1760/isp1760-if.c @@ -246,11 +246,9 @@ static int isp1760_plat_probe(struct platform_device *pdev) return 0; } -static int isp1760_plat_remove(struct platform_device *pdev) +static void isp1760_plat_remove(struct platform_device *pdev) { isp1760_unregister(&pdev->dev); - - return 0; } #ifdef CONFIG_OF @@ -265,7 +263,7 @@ MODULE_DEVICE_TABLE(of, isp1760_of_match); static struct platform_driver isp1760_plat_driver = { .probe = isp1760_plat_probe, - .remove = isp1760_plat_remove, + .remove_new = isp1760_plat_remove, .driver = { .name = "isp1760", .of_match_table = of_match_ptr(isp1760_of_match),
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/usb/isp1760/isp1760-if.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)