| Message ID | 20230315150745.67084-112-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | bb5ba5fe26ac53de23f1c85e97cb8cef31df343f |
| Headers | show |
| Series | ALSA/ASoC: Convert to platform remove callback returning void | expand |
On Wed, 2023-03-15 at 16:06 +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> > --- > sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c > b/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c > index e8e84de86542..e5f9373bed56 100644 > --- a/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c > +++ b/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c > @@ -3323,11 +3323,9 @@ static int mt8188_afe_pcm_dev_probe(struct > platform_device *pdev) > return ret; > } > > -static int mt8188_afe_pcm_dev_remove(struct platform_device *pdev) > +static void mt8188_afe_pcm_dev_remove(struct platform_device *pdev) > { > snd_soc_unregister_component(&pdev->dev); > - > - return 0; > } > > static const struct of_device_id mt8188_afe_pcm_dt_match[] = { > @@ -3348,7 +3346,7 @@ static struct platform_driver > mt8188_afe_pcm_driver = { > .pm = &mt8188_afe_pm_ops, > }, > .probe = mt8188_afe_pcm_dev_probe, > - .remove = mt8188_afe_pcm_dev_remove, > + .remove_new = mt8188_afe_pcm_dev_remove, > }; > Acked-by: Trevor Wu <trevor.wu@mediatek.com> > module_platform_driver(mt8188_afe_pcm_driver);
diff --git a/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c b/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c index e8e84de86542..e5f9373bed56 100644 --- a/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c +++ b/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c @@ -3323,11 +3323,9 @@ static int mt8188_afe_pcm_dev_probe(struct platform_device *pdev) return ret; } -static int mt8188_afe_pcm_dev_remove(struct platform_device *pdev) +static void mt8188_afe_pcm_dev_remove(struct platform_device *pdev) { snd_soc_unregister_component(&pdev->dev); - - return 0; } static const struct of_device_id mt8188_afe_pcm_dt_match[] = { @@ -3348,7 +3346,7 @@ static struct platform_driver mt8188_afe_pcm_driver = { .pm = &mt8188_afe_pm_ops, }, .probe = mt8188_afe_pcm_dev_probe, - .remove = mt8188_afe_pcm_dev_remove, + .remove_new = mt8188_afe_pcm_dev_remove, }; module_platform_driver(mt8188_afe_pcm_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/mediatek/mt8188/mt8188-afe-pcm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)