diff mbox series

[060/173] ASoC: codecs: wm8997: Convert to platform remove callback returning void

Message ID 20230315150745.67084-61-u.kleine-koenig@pengutronix.de (mailing list archive)
State Accepted
Commit e1df73df807721ce0f7be9c58ef6c751112f2aab
Headers show
Series ALSA/ASoC: Convert to platform remove callback returning void | expand

Commit Message

Uwe Kleine-König March 15, 2023, 3:05 p.m. UTC
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/codecs/wm8997.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Charles Keepax March 16, 2023, 9:20 a.m. UTC | #1
On Wed, Mar 15, 2023 at 04:05:52PM +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>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles
diff mbox series

Patch

diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index c0207e9a7d53..87442840f0af 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -1193,7 +1193,7 @@  static int wm8997_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int wm8997_remove(struct platform_device *pdev)
+static void wm8997_remove(struct platform_device *pdev)
 {
 	struct wm8997_priv *wm8997 = platform_get_drvdata(pdev);
 	struct arizona *arizona = wm8997->core.arizona;
@@ -1203,8 +1203,6 @@  static int wm8997_remove(struct platform_device *pdev)
 	arizona_free_spk_irqs(arizona);
 
 	arizona_jack_codec_dev_remove(&wm8997->core);
-
-	return 0;
 }
 
 static struct platform_driver wm8997_codec_driver = {
@@ -1212,7 +1210,7 @@  static struct platform_driver wm8997_codec_driver = {
 		.name = "wm8997-codec",
 	},
 	.probe = wm8997_probe,
-	.remove = wm8997_remove,
+	.remove_new = wm8997_remove,
 };
 
 module_platform_driver(wm8997_codec_driver);