Message ID | 20230317084232.142257-4-u.kleine-koenig@pengutronix.de (mailing list archive) |
---|---|
State | Accepted |
Commit | 4d70dd0a25081bc4e6378d0da4a7c367389df707 |
Headers | show |
Series | spi: atmel-quadspi: Convert to platform remove callback returning void | expand |
On 3/17/23 08:42, 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: Tudor Ambarus <tudor.ambarus@linaro.org> > --- > drivers/spi/atmel-quadspi.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c > index 713a4d6700fd..3d1252566134 100644 > --- a/drivers/spi/atmel-quadspi.c > +++ b/drivers/spi/atmel-quadspi.c > @@ -700,7 +700,7 @@ static int atmel_qspi_probe(struct platform_device *pdev) > return err; > } > > -static int atmel_qspi_remove(struct platform_device *pdev) > +static void atmel_qspi_remove(struct platform_device *pdev) > { > struct spi_controller *ctrl = platform_get_drvdata(pdev); > struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); > @@ -727,8 +727,6 @@ static int atmel_qspi_remove(struct platform_device *pdev) > > pm_runtime_disable(&pdev->dev); > pm_runtime_put_noidle(&pdev->dev); > - > - return 0; > } > > static int __maybe_unused atmel_qspi_suspend(struct device *dev) > @@ -837,7 +835,7 @@ static struct platform_driver atmel_qspi_driver = { > .pm = pm_ptr(&atmel_qspi_pm_ops), > }, > .probe = atmel_qspi_probe, > - .remove = atmel_qspi_remove, > + .remove_new = atmel_qspi_remove, > }; > module_platform_driver(atmel_qspi_driver); >
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 713a4d6700fd..3d1252566134 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -700,7 +700,7 @@ static int atmel_qspi_probe(struct platform_device *pdev) return err; } -static int atmel_qspi_remove(struct platform_device *pdev) +static void atmel_qspi_remove(struct platform_device *pdev) { struct spi_controller *ctrl = platform_get_drvdata(pdev); struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); @@ -727,8 +727,6 @@ static int atmel_qspi_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); pm_runtime_put_noidle(&pdev->dev); - - return 0; } static int __maybe_unused atmel_qspi_suspend(struct device *dev) @@ -837,7 +835,7 @@ static struct platform_driver atmel_qspi_driver = { .pm = pm_ptr(&atmel_qspi_pm_ops), }, .probe = atmel_qspi_probe, - .remove = atmel_qspi_remove, + .remove_new = atmel_qspi_remove, }; module_platform_driver(atmel_qspi_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 in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/spi/atmel-quadspi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)