| Message ID | 20230303172041.2103336-4-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ebf9a50d13a4406b9831f9e2b35f786a3bb18a3e |
| Headers | show |
| Series | spi: Convert to platform remove callback returning void | expand |
On 3/3/23 18:19, 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> Acked-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > drivers/spi/spi-aspeed-smc.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c > index 873ff2cf72c9..3f2548860317 100644 > --- a/drivers/spi/spi-aspeed-smc.c > +++ b/drivers/spi/spi-aspeed-smc.c > @@ -787,13 +787,12 @@ static int aspeed_spi_probe(struct platform_device *pdev) > return ret; > } > > -static int aspeed_spi_remove(struct platform_device *pdev) > +static void aspeed_spi_remove(struct platform_device *pdev) > { > struct aspeed_spi *aspi = platform_get_drvdata(pdev); > > aspeed_spi_enable(aspi, false); > clk_disable_unprepare(aspi->clk); > - return 0; > } > > /* > @@ -1201,7 +1200,7 @@ MODULE_DEVICE_TABLE(of, aspeed_spi_matches); > > static struct platform_driver aspeed_spi_driver = { > .probe = aspeed_spi_probe, > - .remove = aspeed_spi_remove, > + .remove_new = aspeed_spi_remove, > .driver = { > .name = DEVICE_NAME, > .of_match_table = aspeed_spi_matches,
diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index 873ff2cf72c9..3f2548860317 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -787,13 +787,12 @@ static int aspeed_spi_probe(struct platform_device *pdev) return ret; } -static int aspeed_spi_remove(struct platform_device *pdev) +static void aspeed_spi_remove(struct platform_device *pdev) { struct aspeed_spi *aspi = platform_get_drvdata(pdev); aspeed_spi_enable(aspi, false); clk_disable_unprepare(aspi->clk); - return 0; } /* @@ -1201,7 +1200,7 @@ MODULE_DEVICE_TABLE(of, aspeed_spi_matches); static struct platform_driver aspeed_spi_driver = { .probe = aspeed_spi_probe, - .remove = aspeed_spi_remove, + .remove_new = aspeed_spi_remove, .driver = { .name = DEVICE_NAME, .of_match_table = aspeed_spi_matches,
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/spi/spi-aspeed-smc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)