| Message ID | 20230315150745.67084-25-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | d0486266a6ba028fe0197c721994f3de5d21550a |
| 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/atmel-i2s.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c > index 425d66edbf86..49930baf5e4d 100644 > --- a/sound/soc/atmel/atmel-i2s.c > +++ b/sound/soc/atmel/atmel-i2s.c > @@ -717,13 +717,11 @@ static int atmel_i2s_probe(struct platform_device *pdev) > return 0; > } > > -static int atmel_i2s_remove(struct platform_device *pdev) > +static void atmel_i2s_remove(struct platform_device *pdev) > { > struct atmel_i2s_dev *dev = platform_get_drvdata(pdev); > > clk_disable_unprepare(dev->pclk); > - > - return 0; > } > > static struct platform_driver atmel_i2s_driver = { > @@ -732,7 +730,7 @@ static struct platform_driver atmel_i2s_driver = { > .of_match_table = of_match_ptr(atmel_i2s_dt_ids), > }, > .probe = atmel_i2s_probe, > - .remove = atmel_i2s_remove, > + .remove_new = atmel_i2s_remove, > }; > module_platform_driver(atmel_i2s_driver); > > -- > 2.39.2 >
diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c index 425d66edbf86..49930baf5e4d 100644 --- a/sound/soc/atmel/atmel-i2s.c +++ b/sound/soc/atmel/atmel-i2s.c @@ -717,13 +717,11 @@ static int atmel_i2s_probe(struct platform_device *pdev) return 0; } -static int atmel_i2s_remove(struct platform_device *pdev) +static void atmel_i2s_remove(struct platform_device *pdev) { struct atmel_i2s_dev *dev = platform_get_drvdata(pdev); clk_disable_unprepare(dev->pclk); - - return 0; } static struct platform_driver atmel_i2s_driver = { @@ -732,7 +730,7 @@ static struct platform_driver atmel_i2s_driver = { .of_match_table = of_match_ptr(atmel_i2s_dt_ids), }, .probe = atmel_i2s_probe, - .remove = atmel_i2s_remove, + .remove_new = atmel_i2s_remove, }; module_platform_driver(atmel_i2s_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/atmel-i2s.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)