| Message ID | 20230303172041.2103336-5-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b9c5544877b03b7d5b3c4c97e9133d0bb695c9cb |
| Headers | show |
| Series | spi: Convert to platform remove callback returning void | expand |
On 03.03.2023 19:19, Uwe Kleine-König wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 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: Claudiu Beznea <claudiu.beznea@microchip.com> > --- > drivers/spi/spi-at91-usart.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c > index fab9d223e24a..4fb3653b5941 100644 > --- a/drivers/spi/spi-at91-usart.c > +++ b/drivers/spi/spi-at91-usart.c > @@ -647,15 +647,13 @@ __maybe_unused static int at91_usart_spi_resume(struct device *dev) > return spi_controller_resume(ctrl); > } > > -static int at91_usart_spi_remove(struct platform_device *pdev) > +static void at91_usart_spi_remove(struct platform_device *pdev) > { > struct spi_controller *ctlr = platform_get_drvdata(pdev); > struct at91_usart_spi *aus = spi_controller_get_devdata(ctlr); > > at91_usart_spi_release_dma(ctlr); > clk_disable_unprepare(aus->clk); > - > - return 0; > } > > static const struct dev_pm_ops at91_usart_spi_pm_ops = { > @@ -670,7 +668,7 @@ static struct platform_driver at91_usart_spi_driver = { > .pm = &at91_usart_spi_pm_ops, > }, > .probe = at91_usart_spi_probe, > - .remove = at91_usart_spi_remove, > + .remove_new = at91_usart_spi_remove, > }; > > module_platform_driver(at91_usart_spi_driver); > -- > 2.39.1 >
diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c index fab9d223e24a..4fb3653b5941 100644 --- a/drivers/spi/spi-at91-usart.c +++ b/drivers/spi/spi-at91-usart.c @@ -647,15 +647,13 @@ __maybe_unused static int at91_usart_spi_resume(struct device *dev) return spi_controller_resume(ctrl); } -static int at91_usart_spi_remove(struct platform_device *pdev) +static void at91_usart_spi_remove(struct platform_device *pdev) { struct spi_controller *ctlr = platform_get_drvdata(pdev); struct at91_usart_spi *aus = spi_controller_get_devdata(ctlr); at91_usart_spi_release_dma(ctlr); clk_disable_unprepare(aus->clk); - - return 0; } static const struct dev_pm_ops at91_usart_spi_pm_ops = { @@ -670,7 +668,7 @@ static struct platform_driver at91_usart_spi_driver = { .pm = &at91_usart_spi_pm_ops, }, .probe = at91_usart_spi_probe, - .remove = at91_usart_spi_remove, + .remove_new = at91_usart_spi_remove, }; module_platform_driver(at91_usart_spi_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/spi-at91-usart.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)