| Message ID | 20230315150745.67084-33-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | c79ddc74c50979665d95382137aec0b4c81a61d8 |
| 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/sam9x5_wm8731.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c > index 99310e40e7a6..cd1d59a90e02 100644 > --- a/sound/soc/atmel/sam9x5_wm8731.c > +++ b/sound/soc/atmel/sam9x5_wm8731.c > @@ -176,14 +176,12 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) > return ret; > } > > -static int sam9x5_wm8731_driver_remove(struct platform_device *pdev) > +static void sam9x5_wm8731_driver_remove(struct platform_device *pdev) > { > struct snd_soc_card *card = platform_get_drvdata(pdev); > struct sam9x5_drvdata *priv = card->drvdata; > > atmel_ssc_put_audio(priv->ssc_id); > - > - return 0; > } > > static const struct of_device_id sam9x5_wm8731_of_match[] = { > @@ -198,7 +196,7 @@ static struct platform_driver sam9x5_wm8731_driver = { > .of_match_table = of_match_ptr(sam9x5_wm8731_of_match), > }, > .probe = sam9x5_wm8731_driver_probe, > - .remove = sam9x5_wm8731_driver_remove, > + .remove_new = sam9x5_wm8731_driver_remove, > }; > module_platform_driver(sam9x5_wm8731_driver); > > -- > 2.39.2 >
diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c index 99310e40e7a6..cd1d59a90e02 100644 --- a/sound/soc/atmel/sam9x5_wm8731.c +++ b/sound/soc/atmel/sam9x5_wm8731.c @@ -176,14 +176,12 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) return ret; } -static int sam9x5_wm8731_driver_remove(struct platform_device *pdev) +static void sam9x5_wm8731_driver_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); struct sam9x5_drvdata *priv = card->drvdata; atmel_ssc_put_audio(priv->ssc_id); - - return 0; } static const struct of_device_id sam9x5_wm8731_of_match[] = { @@ -198,7 +196,7 @@ static struct platform_driver sam9x5_wm8731_driver = { .of_match_table = of_match_ptr(sam9x5_wm8731_of_match), }, .probe = sam9x5_wm8731_driver_probe, - .remove = sam9x5_wm8731_driver_remove, + .remove_new = sam9x5_wm8731_driver_remove, }; module_platform_driver(sam9x5_wm8731_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/sam9x5_wm8731.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)