| Message ID | 20230315150745.67084-27-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | b0570709d123ee8bfed32f968d665366fb1a6d2d |
| Headers | show |
| Series | ALSA/ASoC: Convert to platform remove callback returning void | expand |
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-i2s-mcc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c > index 6dfb96c576ff..7c83d48ca1a0 100644 > --- a/sound/soc/atmel/mchp-i2s-mcc.c > +++ b/sound/soc/atmel/mchp-i2s-mcc.c > @@ -1088,13 +1088,11 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev) > return 0; > } > > -static int mchp_i2s_mcc_remove(struct platform_device *pdev) > +static void mchp_i2s_mcc_remove(struct platform_device *pdev) > { > struct mchp_i2s_mcc_dev *dev = platform_get_drvdata(pdev); > > clk_disable_unprepare(dev->pclk); > - > - return 0; > } > > static struct platform_driver mchp_i2s_mcc_driver = { > @@ -1103,7 +1101,7 @@ static struct platform_driver mchp_i2s_mcc_driver = { > .of_match_table = of_match_ptr(mchp_i2s_mcc_dt_ids), > }, > .probe = mchp_i2s_mcc_probe, > - .remove = mchp_i2s_mcc_remove, > + .remove_new = mchp_i2s_mcc_remove, > }; > module_platform_driver(mchp_i2s_mcc_driver); > > -- > 2.39.2 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c index 6dfb96c576ff..7c83d48ca1a0 100644 --- a/sound/soc/atmel/mchp-i2s-mcc.c +++ b/sound/soc/atmel/mchp-i2s-mcc.c @@ -1088,13 +1088,11 @@ static int mchp_i2s_mcc_probe(struct platform_device *pdev) return 0; } -static int mchp_i2s_mcc_remove(struct platform_device *pdev) +static void mchp_i2s_mcc_remove(struct platform_device *pdev) { struct mchp_i2s_mcc_dev *dev = platform_get_drvdata(pdev); clk_disable_unprepare(dev->pclk); - - return 0; } static struct platform_driver mchp_i2s_mcc_driver = { @@ -1103,7 +1101,7 @@ static struct platform_driver mchp_i2s_mcc_driver = { .of_match_table = of_match_ptr(mchp_i2s_mcc_dt_ids), }, .probe = mchp_i2s_mcc_probe, - .remove = mchp_i2s_mcc_remove, + .remove_new = mchp_i2s_mcc_remove, }; module_platform_driver(mchp_i2s_mcc_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-i2s-mcc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)