regulator: virtual: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 5 Dec 2023 12:26:22 +0000 (13:26 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 11 Dec 2023 12:54:31 +0000 (12:54 +0000)
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://msgid.link/r/d9954f02ae51b1b0b0077c710d16bfaeafa216ec.1701778038.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/virtual.c

index d5a160efdae64f2439ef17f0bba20b0dea7eccbe..0a0ee186c6aff3ddbc5341b87bd3f8f45fbd6e64 100644 (file)
@@ -345,7 +345,7 @@ static int regulator_virtual_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int regulator_virtual_remove(struct platform_device *pdev)
+static void regulator_virtual_remove(struct platform_device *pdev)
 {
        struct virtual_consumer_data *drvdata = platform_get_drvdata(pdev);
 
@@ -353,13 +353,11 @@ static int regulator_virtual_remove(struct platform_device *pdev)
 
        if (drvdata->enabled)
                regulator_disable(drvdata->regulator);
-
-       return 0;
 }
 
 static struct platform_driver regulator_virtual_consumer_driver = {
        .probe          = regulator_virtual_probe,
-       .remove         = regulator_virtual_remove,
+       .remove_new     = regulator_virtual_remove,
        .driver         = {
                .name           = "reg-virt-consumer",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,