On 15.03.2023 17:05, 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> > --- > sound/soc/atmel/mchp-pdmc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c > index 1aed3baa9369..7fd2c3e100e8 100644 > --- a/sound/soc/atmel/mchp-pdmc.c > +++ b/sound/soc/atmel/mchp-pdmc.c > @@ -1134,7 +1134,7 @@ static int mchp_pdmc_probe(struct platform_device *pdev) > return ret; > } > > -static int mchp_pdmc_remove(struct platform_device *pdev) > +static void mchp_pdmc_remove(struct platform_device *pdev) > { > struct mchp_pdmc *dd = platform_get_drvdata(pdev); > > @@ -1142,8 +1142,6 @@ static int mchp_pdmc_remove(struct platform_device *pdev) > mchp_pdmc_runtime_suspend(dd->dev); > > pm_runtime_disable(dd->dev); > - > - return 0; > } > > static const struct of_device_id mchp_pdmc_of_match[] = { > @@ -1168,7 +1166,7 @@ static struct platform_driver mchp_pdmc_driver = { > .pm = pm_ptr(&mchp_pdmc_pm_ops), > }, > .probe = mchp_pdmc_probe, > - .remove = mchp_pdmc_remove, > + .remove_new = mchp_pdmc_remove, > }; > module_platform_driver(mchp_pdmc_driver); > > -- > 2.39.2 >
diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index 1aed3baa9369..7fd2c3e100e8 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -1134,7 +1134,7 @@ static int mchp_pdmc_probe(struct platform_device *pdev) return ret; } -static int mchp_pdmc_remove(struct platform_device *pdev) +static void mchp_pdmc_remove(struct platform_device *pdev) { struct mchp_pdmc *dd = platform_get_drvdata(pdev); @@ -1142,8 +1142,6 @@ static int mchp_pdmc_remove(struct platform_device *pdev) mchp_pdmc_runtime_suspend(dd->dev); pm_runtime_disable(dd->dev); - - return 0; } static const struct of_device_id mchp_pdmc_of_match[] = { @@ -1168,7 +1166,7 @@ static struct platform_driver mchp_pdmc_driver = { .pm = pm_ptr(&mchp_pdmc_pm_ops), }, .probe = mchp_pdmc_probe, - .remove = mchp_pdmc_remove, + .remove_new = mchp_pdmc_remove, }; module_platform_driver(mchp_pdmc_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> --- sound/soc/atmel/mchp-pdmc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)