Skip to content

Commit 6b02f5a

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
ASoC: starfive/jh7110-pwmdac: Convert to platform remove callback returning void
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> Link: https://lore.kernel.org/r/20231013221945.1489203-12-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 491a113 commit 6b02f5a

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

sound/soc/starfive/jh7110_pwmdac.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,9 @@ static int jh7110_pwmdac_probe(struct platform_device *pdev)
498498
return ret;
499499
}
500500

501-
static int jh7110_pwmdac_remove(struct platform_device *pdev)
501+
static void jh7110_pwmdac_remove(struct platform_device *pdev)
502502
{
503503
pm_runtime_disable(&pdev->dev);
504-
return 0;
505504
}
506505

507506
static const struct of_device_id jh7110_pwmdac_of_match[] = {
@@ -517,7 +516,7 @@ static struct platform_driver jh7110_pwmdac_driver = {
517516
.pm = pm_ptr(&jh7110_pwmdac_pm_ops),
518517
},
519518
.probe = jh7110_pwmdac_probe,
520-
.remove = jh7110_pwmdac_remove,
519+
.remove_new = jh7110_pwmdac_remove,
521520
};
522521
module_platform_driver(jh7110_pwmdac_driver);
523522

0 commit comments

Comments
 (0)