| Message ID | 20230405141009.3400693-5-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 37e7750091ad5f3911a8266564e89394c6ac94a1 |
| Headers | show |
| Series | usb: musb: Convert to platform remove callback returning void | expand |
On Wed, Apr 05, 2023 at 04:10:03PM +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 in the remove > callback to the void returning variant. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > --- > drivers/usb/musb/mpfs.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/musb/mpfs.c b/drivers/usb/musb/mpfs.c > index cea2e8108867..24b98716f7fc 100644 > --- a/drivers/usb/musb/mpfs.c > +++ b/drivers/usb/musb/mpfs.c > @@ -235,15 +235,13 @@ static int mpfs_probe(struct platform_device *pdev) > return ret; > } > > -static int mpfs_remove(struct platform_device *pdev) > +static void mpfs_remove(struct platform_device *pdev) > { > struct mpfs_glue *glue = platform_get_drvdata(pdev); > > clk_disable_unprepare(glue->clk); > platform_device_unregister(glue->musb); > usb_phy_generic_unregister(pdev); > - > - return 0; > } > > #ifdef CONFIG_OF > @@ -256,7 +254,7 @@ MODULE_DEVICE_TABLE(of, mpfs_id_table); > > static struct platform_driver mpfs_musb_driver = { > .probe = mpfs_probe, > - .remove = mpfs_remove, > + .remove_new = mpfs_remove, > .driver = { > .name = "mpfs-musb", > .of_match_table = of_match_ptr(mpfs_id_table) > -- > 2.39.2 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
diff --git a/drivers/usb/musb/mpfs.c b/drivers/usb/musb/mpfs.c index cea2e8108867..24b98716f7fc 100644 --- a/drivers/usb/musb/mpfs.c +++ b/drivers/usb/musb/mpfs.c @@ -235,15 +235,13 @@ static int mpfs_probe(struct platform_device *pdev) return ret; } -static int mpfs_remove(struct platform_device *pdev) +static void mpfs_remove(struct platform_device *pdev) { struct mpfs_glue *glue = platform_get_drvdata(pdev); clk_disable_unprepare(glue->clk); platform_device_unregister(glue->musb); usb_phy_generic_unregister(pdev); - - return 0; } #ifdef CONFIG_OF @@ -256,7 +254,7 @@ MODULE_DEVICE_TABLE(of, mpfs_id_table); static struct platform_driver mpfs_musb_driver = { .probe = mpfs_probe, - .remove = mpfs_remove, + .remove_new = mpfs_remove, .driver = { .name = "mpfs-musb", .of_match_table = of_match_ptr(mpfs_id_table)
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 in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/usb/musb/mpfs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)