| Message ID | 20230303172041.2103336-23-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f74abea25ab2809958c7ce8e29e710c66a490b64 |
| Headers | show |
| Series | spi: Convert to platform remove callback returning void | expand |
On Fri, Mar 03, 2023 at 06:19:36PM +0100, 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. Thanks! Acked-by: Serge Semin <fancer.lancer@gmail.com> -Serge(y) > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/spi/spi-dw-mmio.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c > index 26c40ea6dd12..6ae124c30969 100644 > --- a/drivers/spi/spi-dw-mmio.c > +++ b/drivers/spi/spi-dw-mmio.c > @@ -328,7 +328,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) > return ret; > } > > -static int dw_spi_mmio_remove(struct platform_device *pdev) > +static void dw_spi_mmio_remove(struct platform_device *pdev) > { > struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); > > @@ -337,8 +337,6 @@ static int dw_spi_mmio_remove(struct platform_device *pdev) > clk_disable_unprepare(dwsmmio->pclk); > clk_disable_unprepare(dwsmmio->clk); > reset_control_assert(dwsmmio->rstc); > - > - return 0; > } > > static const struct of_device_id dw_spi_mmio_of_match[] = { > @@ -366,7 +364,7 @@ MODULE_DEVICE_TABLE(acpi, dw_spi_mmio_acpi_match); > > static struct platform_driver dw_spi_mmio_driver = { > .probe = dw_spi_mmio_probe, > - .remove = dw_spi_mmio_remove, > + .remove_new = dw_spi_mmio_remove, > .driver = { > .name = DRIVER_NAME, > .of_match_table = dw_spi_mmio_of_match, > -- > 2.39.1 >
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 26c40ea6dd12..6ae124c30969 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -328,7 +328,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) return ret; } -static int dw_spi_mmio_remove(struct platform_device *pdev) +static void dw_spi_mmio_remove(struct platform_device *pdev) { struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); @@ -337,8 +337,6 @@ static int dw_spi_mmio_remove(struct platform_device *pdev) clk_disable_unprepare(dwsmmio->pclk); clk_disable_unprepare(dwsmmio->clk); reset_control_assert(dwsmmio->rstc); - - return 0; } static const struct of_device_id dw_spi_mmio_of_match[] = { @@ -366,7 +364,7 @@ MODULE_DEVICE_TABLE(acpi, dw_spi_mmio_acpi_match); static struct platform_driver dw_spi_mmio_driver = { .probe = dw_spi_mmio_probe, - .remove = dw_spi_mmio_remove, + .remove_new = dw_spi_mmio_remove, .driver = { .name = DRIVER_NAME, .of_match_table = dw_spi_mmio_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 (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-dw-mmio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)