| Message ID | 20230707073653.3396988-1-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 48cb8ff3e250301a5a48925281a7096969ab3a48 |
| Headers | show |
| Series | usb: cdns3: starfive: Convert to platform remove callback returning void | expand |
Hi Uwe Thanks！ On 2023/7/7 15:36, 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 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/cdns3/cdns3-starfive.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/cdns3/cdns3-starfive.c b/drivers/usb/cdns3/cdns3-starfive.c > index fc1f003b145d..a7265b86e427 100644 > --- a/drivers/usb/cdns3/cdns3-starfive.c > +++ b/drivers/usb/cdns3/cdns3-starfive.c > @@ -166,7 +166,7 @@ static int cdns_starfive_remove_core(struct device *dev, void *c) > return 0; > } > > -static int cdns_starfive_remove(struct platform_device *pdev) > +static void cdns_starfive_remove(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct cdns_starfive *data = dev_get_drvdata(dev); > @@ -178,8 +178,6 @@ static int cdns_starfive_remove(struct platform_device *pdev) > pm_runtime_put_noidle(dev); > cdns_clk_rst_deinit(data); > platform_set_drvdata(pdev, NULL); > - > - return 0; > } > > #ifdef CONFIG_PM > @@ -232,7 +230,7 @@ MODULE_DEVICE_TABLE(of, cdns_starfive_of_match); > > static struct platform_driver cdns_starfive_driver = { > .probe = cdns_starfive_probe, > - .remove = cdns_starfive_remove, > + .remove_new = cdns_starfive_remove, > .driver = { > .name = "cdns3-starfive", > .of_match_table = cdns_starfive_of_match, > > base-commit: 5133c9e51de41bfa902153888e11add3342ede18
On 07/07/2023 10:36, 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 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> Acked-by: Roger Quadros <rogerq@kernel.org>
diff --git a/drivers/usb/cdns3/cdns3-starfive.c b/drivers/usb/cdns3/cdns3-starfive.c index fc1f003b145d..a7265b86e427 100644 --- a/drivers/usb/cdns3/cdns3-starfive.c +++ b/drivers/usb/cdns3/cdns3-starfive.c @@ -166,7 +166,7 @@ static int cdns_starfive_remove_core(struct device *dev, void *c) return 0; } -static int cdns_starfive_remove(struct platform_device *pdev) +static void cdns_starfive_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct cdns_starfive *data = dev_get_drvdata(dev); @@ -178,8 +178,6 @@ static int cdns_starfive_remove(struct platform_device *pdev) pm_runtime_put_noidle(dev); cdns_clk_rst_deinit(data); platform_set_drvdata(pdev, NULL); - - return 0; } #ifdef CONFIG_PM @@ -232,7 +230,7 @@ MODULE_DEVICE_TABLE(of, cdns_starfive_of_match); static struct platform_driver cdns_starfive_driver = { .probe = cdns_starfive_probe, - .remove = cdns_starfive_remove, + .remove_new = cdns_starfive_remove, .driver = { .name = "cdns3-starfive", .of_match_table = cdns_starfive_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/cdns3/cdns3-starfive.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) base-commit: 5133c9e51de41bfa902153888e11add3342ede18