power: supply: wm831x_power: Convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 18 Sep 2023 13:36:58 +0000 (15:36 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Mon, 18 Sep 2023 18:08:04 +0000 (20:08 +0200)
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() is 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/20230918133700.1254499-31-u.kleine-koenig@pengutronix.de
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/wm831x_power.c

index 82e31066c746e06bca142728e03123bf50e067c3..e49b01ee5f3efe949d3a5a5878af8821a66ae588 100644 (file)
@@ -694,7 +694,7 @@ err:
        return ret;
 }
 
-static int wm831x_power_remove(struct platform_device *pdev)
+static void wm831x_power_remove(struct platform_device *pdev)
 {
        struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
        struct wm831x *wm831x = wm831x_power->wm831x;
@@ -722,12 +722,11 @@ static int wm831x_power_remove(struct platform_device *pdev)
                power_supply_unregister(wm831x_power->battery);
        power_supply_unregister(wm831x_power->wall);
        power_supply_unregister(wm831x_power->usb);
-       return 0;
 }
 
 static struct platform_driver wm831x_power_driver = {
        .probe = wm831x_power_probe,
-       .remove = wm831x_power_remove,
+       .remove_new = wm831x_power_remove,
        .driver = {
                .name = "wm831x-power",
        },