| Message ID | 20230303172041.2103336-38-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | beb6ed0f8cfa844556ac1f6d494cc9b4f6cb1994 |
| Headers | show |
| Series | spi: Convert to platform remove callback returning void | expand |
On Fri, Mar 03, 2023 at 06:19:51PM +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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > --- > drivers/spi/spi-microchip-core.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c > index aeaa1da88f39..e6cf6ff08061 100644 > --- a/drivers/spi/spi-microchip-core.c > +++ b/drivers/spi/spi-microchip-core.c > @@ -566,7 +566,7 @@ static int mchp_corespi_probe(struct platform_device *pdev) > return 0; > } > > -static int mchp_corespi_remove(struct platform_device *pdev) > +static void mchp_corespi_remove(struct platform_device *pdev) > { > struct spi_master *master = platform_get_drvdata(pdev); > struct mchp_corespi *spi = spi_master_get_devdata(master); > @@ -574,8 +574,6 @@ static int mchp_corespi_remove(struct platform_device *pdev) > mchp_corespi_disable_ints(spi); > clk_disable_unprepare(spi->clk); > mchp_corespi_disable(spi); > - > - return 0; > } > > #define MICROCHIP_SPI_PM_OPS (NULL) > @@ -599,7 +597,7 @@ static struct platform_driver mchp_corespi_driver = { > .pm = MICROCHIP_SPI_PM_OPS, > .of_match_table = of_match_ptr(mchp_corespi_dt_ids), > }, > - .remove = mchp_corespi_remove, > + .remove_new = mchp_corespi_remove, > }; > module_platform_driver(mchp_corespi_driver); > MODULE_DESCRIPTION("Microchip coreSPI SPI controller driver"); > -- > 2.39.1 >
diff --git a/drivers/spi/spi-microchip-core.c b/drivers/spi/spi-microchip-core.c index aeaa1da88f39..e6cf6ff08061 100644 --- a/drivers/spi/spi-microchip-core.c +++ b/drivers/spi/spi-microchip-core.c @@ -566,7 +566,7 @@ static int mchp_corespi_probe(struct platform_device *pdev) return 0; } -static int mchp_corespi_remove(struct platform_device *pdev) +static void mchp_corespi_remove(struct platform_device *pdev) { struct spi_master *master = platform_get_drvdata(pdev); struct mchp_corespi *spi = spi_master_get_devdata(master); @@ -574,8 +574,6 @@ static int mchp_corespi_remove(struct platform_device *pdev) mchp_corespi_disable_ints(spi); clk_disable_unprepare(spi->clk); mchp_corespi_disable(spi); - - return 0; } #define MICROCHIP_SPI_PM_OPS (NULL) @@ -599,7 +597,7 @@ static struct platform_driver mchp_corespi_driver = { .pm = MICROCHIP_SPI_PM_OPS, .of_match_table = of_match_ptr(mchp_corespi_dt_ids), }, - .remove = mchp_corespi_remove, + .remove_new = mchp_corespi_remove, }; module_platform_driver(mchp_corespi_driver); MODULE_DESCRIPTION("Microchip coreSPI SPI controller 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-microchip-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)