Skip to content

Commit dab68bb

Browse files
Uwe Kleine-Königsre
authored andcommitted
power: supply: wm831x_power: 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() 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>
1 parent fc7b34a commit dab68bb

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/power/supply/wm831x_power.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ static int wm831x_power_probe(struct platform_device *pdev)
694694
return ret;
695695
}
696696

697-
static int wm831x_power_remove(struct platform_device *pdev)
697+
static void wm831x_power_remove(struct platform_device *pdev)
698698
{
699699
struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
700700
struct wm831x *wm831x = wm831x_power->wm831x;
@@ -722,12 +722,11 @@ static int wm831x_power_remove(struct platform_device *pdev)
722722
power_supply_unregister(wm831x_power->battery);
723723
power_supply_unregister(wm831x_power->wall);
724724
power_supply_unregister(wm831x_power->usb);
725-
return 0;
726725
}
727726

728727
static struct platform_driver wm831x_power_driver = {
729728
.probe = wm831x_power_probe,
730-
.remove = wm831x_power_remove,
729+
.remove_new = wm831x_power_remove,
731730
.driver = {
732731
.name = "wm831x-power",
733732
},

0 commit comments

Comments
 (0)