| Message ID | 20230517230239.187727-89-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 456a91ce7de4b9157fd5013c1e4dd8dd3c6daccb |
| Headers | show |
| Series | usb: Convert to platform remove callback returning void | expand |
Hi Uwe, > From: Uwe Kleine-König, Sent: Thursday, May 18, 2023 8:03 AM > > 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> Thank you for the patch! Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda > --- > drivers/usb/renesas_usbhs/common.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c > index fa34efabcccf..111b7ee152c4 100644 > --- a/drivers/usb/renesas_usbhs/common.c > +++ b/drivers/usb/renesas_usbhs/common.c > @@ -762,7 +762,7 @@ static int usbhs_probe(struct platform_device *pdev) > return ret; > } > > -static int usbhs_remove(struct platform_device *pdev) > +static void usbhs_remove(struct platform_device *pdev) > { > struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); > > @@ -780,8 +780,6 @@ static int usbhs_remove(struct platform_device *pdev) > usbhs_mod_remove(priv); > usbhs_fifo_remove(priv); > usbhs_pipe_remove(priv); > - > - return 0; > } > > static __maybe_unused int usbhsc_suspend(struct device *dev) > @@ -826,7 +824,7 @@ static struct platform_driver renesas_usbhs_driver = { > .of_match_table = usbhs_of_match, > }, > .probe = usbhs_probe, > - .remove = usbhs_remove, > + .remove_new = usbhs_remove, > }; > > module_platform_driver(renesas_usbhs_driver); > -- > 2.39.2
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c index fa34efabcccf..111b7ee152c4 100644 --- a/drivers/usb/renesas_usbhs/common.c +++ b/drivers/usb/renesas_usbhs/common.c @@ -762,7 +762,7 @@ static int usbhs_probe(struct platform_device *pdev) return ret; } -static int usbhs_remove(struct platform_device *pdev) +static void usbhs_remove(struct platform_device *pdev) { struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); @@ -780,8 +780,6 @@ static int usbhs_remove(struct platform_device *pdev) usbhs_mod_remove(priv); usbhs_fifo_remove(priv); usbhs_pipe_remove(priv); - - return 0; } static __maybe_unused int usbhsc_suspend(struct device *dev) @@ -826,7 +824,7 @@ static struct platform_driver renesas_usbhs_driver = { .of_match_table = usbhs_of_match, }, .probe = usbhs_probe, - .remove = usbhs_remove, + .remove_new = usbhs_remove, }; module_platform_driver(renesas_usbhs_driver);
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/renesas_usbhs/common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)