diff mbox series

[3/7] ASoC: starfive/jh7110-pwmdac: Convert to platform remove callback returning void

Message ID 20231013221945.1489203-12-u.kleine-koenig@pengutronix.de
State New
Headers show
Series ASoc: Another series to convert to struct platform_driver:remove_new() | expand

Commit Message

Uwe Kleine-König Oct. 13, 2023, 10:19 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 ignored (apart
from emitting a warning) 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. Eventually after all drivers
are converted, .remove_new() will be renamed to .remove().

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/starfive/jh7110_pwmdac.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/sound/soc/starfive/jh7110_pwmdac.c b/sound/soc/starfive/jh7110_pwmdac.c
index 65ee3e339494..4a4dd431b82b 100644
--- a/sound/soc/starfive/jh7110_pwmdac.c
+++ b/sound/soc/starfive/jh7110_pwmdac.c
@@ -498,10 +498,9 @@  static int jh7110_pwmdac_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int jh7110_pwmdac_remove(struct platform_device *pdev)
+static void jh7110_pwmdac_remove(struct platform_device *pdev)
 {
 	pm_runtime_disable(&pdev->dev);
-	return 0;
 }
 
 static const struct of_device_id jh7110_pwmdac_of_match[] = {
@@ -517,7 +516,7 @@  static struct platform_driver jh7110_pwmdac_driver = {
 		.pm = pm_ptr(&jh7110_pwmdac_pm_ops),
 	},
 	.probe		= jh7110_pwmdac_probe,
-	.remove		= jh7110_pwmdac_remove,
+	.remove_new	= jh7110_pwmdac_remove,
 };
 module_platform_driver(jh7110_pwmdac_driver);