| Message ID | 20230518202636.273407-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 622cc875dd2b1e560235e85726c818e58d3541ef |
| Headers | show |
| Series | usb: host: fhci-hcd: Convert to platform remove callback returning void | expand |
On Thu, May 18, 2023 at 10:26:36PM +0200, 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 (mostly) ignored > 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. > > Trivially convert this driver from always returning zero to the void > returning variant. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > drivers/usb/host/fhci-hcd.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c > index 92794ffc25c8..66a045e01dad 100644 > --- a/drivers/usb/host/fhci-hcd.c > +++ b/drivers/usb/host/fhci-hcd.c > @@ -757,7 +757,7 @@ static int of_fhci_probe(struct platform_device *ofdev) > return ret; > } > > -static int fhci_remove(struct device *dev) > +static void fhci_remove(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct fhci_hcd *fhci = hcd_to_fhci(hcd); > @@ -771,12 +771,11 @@ static int fhci_remove(struct device *dev) > qe_pin_free(fhci->pins[j]); > fhci_dfs_destroy(fhci); > usb_put_hcd(hcd); > - return 0; > } > > -static int of_fhci_remove(struct platform_device *ofdev) > +static void of_fhci_remove(struct platform_device *ofdev) > { > - return fhci_remove(&ofdev->dev); > + fhci_remove(&ofdev->dev); > } > > static const struct of_device_id of_fhci_match[] = { > @@ -791,7 +790,7 @@ static struct platform_driver of_fhci_driver = { > .of_match_table = of_fhci_match, > }, > .probe = of_fhci_probe, > - .remove = of_fhci_remove, > + .remove_new = of_fhci_remove, > }; > > module_platform_driver(of_fhci_driver); > > base-commit: ac9a78681b921877518763ba0e89202254349d1b > -- > 2.39.2 >
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 92794ffc25c8..66a045e01dad 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c @@ -757,7 +757,7 @@ static int of_fhci_probe(struct platform_device *ofdev) return ret; } -static int fhci_remove(struct device *dev) +static void fhci_remove(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct fhci_hcd *fhci = hcd_to_fhci(hcd); @@ -771,12 +771,11 @@ static int fhci_remove(struct device *dev) qe_pin_free(fhci->pins[j]); fhci_dfs_destroy(fhci); usb_put_hcd(hcd); - return 0; } -static int of_fhci_remove(struct platform_device *ofdev) +static void of_fhci_remove(struct platform_device *ofdev) { - return fhci_remove(&ofdev->dev); + fhci_remove(&ofdev->dev); } static const struct of_device_id of_fhci_match[] = { @@ -791,7 +790,7 @@ static struct platform_driver of_fhci_driver = { .of_match_table = of_fhci_match, }, .probe = of_fhci_probe, - .remove = of_fhci_remove, + .remove_new = of_fhci_remove, }; module_platform_driver(of_fhci_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 (mostly) ignored 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. Trivially convert this driver from always returning zero to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/usb/host/fhci-hcd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) base-commit: ac9a78681b921877518763ba0e89202254349d1b