diff mbox series

[14/32] power: supply: ipaq_micro_battery: Convert to platform remove callback returning void

Message ID 20230918133700.1254499-15-u.kleine-koenig@pengutronix.de
State Accepted
Commit cbc3e1136d1f8b934cc41b4bc12f5c732d543c59
Headers show
Series power: supply: Convert to platform remove callback returning void | expand

Commit Message

Uwe Kleine-König Sept. 18, 2023, 1:36 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() 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>
 drivers/power/supply/ipaq_micro_battery.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/drivers/power/supply/ipaq_micro_battery.c b/drivers/power/supply/ipaq_micro_battery.c
index 192d9db0fb00..66cc649f702a 100644
--- a/drivers/power/supply/ipaq_micro_battery.c
+++ b/drivers/power/supply/ipaq_micro_battery.c
@@ -265,7 +265,7 @@  static int micro_batt_probe(struct platform_device *pdev)
 	return ret;
-static int micro_batt_remove(struct platform_device *pdev)
+static void micro_batt_remove(struct platform_device *pdev)
 	struct micro_battery *mb = platform_get_drvdata(pdev);
@@ -274,8 +274,6 @@  static int micro_batt_remove(struct platform_device *pdev)
-	return 0;
 static int __maybe_unused micro_batt_suspend(struct device *dev)
@@ -304,7 +302,7 @@  static struct platform_driver micro_batt_device_driver = {
 		.pm	= &micro_batt_dev_pm_ops,
 	.probe		= micro_batt_probe,
-	.remove		= micro_batt_remove,
+	.remove_new	= micro_batt_remove,