| Message ID | 20230517230239.187727-70-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 18b93fc987c43523d9b1b87f6f12e4d9d2792944 |
| 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:02 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/host/ohci-platform.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c > index a84305091c43..03232c5936e8 100644 > --- a/drivers/usb/host/ohci-platform.c > +++ b/drivers/usb/host/ohci-platform.c > @@ -239,7 +239,7 @@ static int ohci_platform_probe(struct platform_device *dev) > return err; > } > > -static int ohci_platform_remove(struct platform_device *dev) > +static void ohci_platform_remove(struct platform_device *dev) > { > struct usb_hcd *hcd = platform_get_drvdata(dev); > struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev); > @@ -264,8 +264,6 @@ static int ohci_platform_remove(struct platform_device *dev) > > if (pdata == &ohci_platform_defaults) > dev->dev.platform_data = NULL; > - > - return 0; > } > > #ifdef CONFIG_PM_SLEEP > @@ -347,7 +345,7 @@ static const struct dev_pm_ops ohci_platform_pm_ops = { > static struct platform_driver ohci_platform_driver = { > .id_table = ohci_platform_table, > .probe = ohci_platform_probe, > - .remove = ohci_platform_remove, > + .remove_new = ohci_platform_remove, > .shutdown = usb_hcd_platform_shutdown, > .driver = { > .name = "ohci-platform", > -- > 2.39.2
diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c index a84305091c43..03232c5936e8 100644 --- a/drivers/usb/host/ohci-platform.c +++ b/drivers/usb/host/ohci-platform.c @@ -239,7 +239,7 @@ static int ohci_platform_probe(struct platform_device *dev) return err; } -static int ohci_platform_remove(struct platform_device *dev) +static void ohci_platform_remove(struct platform_device *dev) { struct usb_hcd *hcd = platform_get_drvdata(dev); struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev); @@ -264,8 +264,6 @@ static int ohci_platform_remove(struct platform_device *dev) if (pdata == &ohci_platform_defaults) dev->dev.platform_data = NULL; - - return 0; } #ifdef CONFIG_PM_SLEEP @@ -347,7 +345,7 @@ static const struct dev_pm_ops ohci_platform_pm_ops = { static struct platform_driver ohci_platform_driver = { .id_table = ohci_platform_table, .probe = ohci_platform_probe, - .remove = ohci_platform_remove, + .remove_new = ohci_platform_remove, .shutdown = usb_hcd_platform_shutdown, .driver = { .name = "ohci-platform",
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/host/ohci-platform.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)