aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2023-09-18 15:36:48 +0200
committerSebastian Reichel <sebastian.reichel@collabora.com>2023-09-18 20:08:03 +0200
commit026f25f221866ea89a33697935995db6a1c25a52 (patch)
tree4130d5237d83ba5b98626ec239bdff00cc314949
parentpower: supply: max77693_charger: Convert to platform remove callback returning void (diff)
downloadwireguard-linux-026f25f221866ea89a33697935995db6a1c25a52.tar.xz
wireguard-linux-026f25f221866ea89a33697935995db6a1c25a52.zip
power: supply: max8925_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-21-u.kleine-koenig@pengutronix.de Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
-rw-r--r--drivers/power/supply/max8925_power.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/power/supply/max8925_power.c b/drivers/power/supply/max8925_power.c
index 8878f9131184..4a2d6894f94e 100644
--- a/drivers/power/supply/max8925_power.c
+++ b/drivers/power/supply/max8925_power.c
@@ -566,7 +566,7 @@ out:
return ret;
}
-static int max8925_power_remove(struct platform_device *pdev)
+static void max8925_power_remove(struct platform_device *pdev)
{
struct max8925_power_info *info = platform_get_drvdata(pdev);
@@ -576,12 +576,11 @@ static int max8925_power_remove(struct platform_device *pdev)
power_supply_unregister(info->battery);
max8925_deinit_charger(info);
}
- return 0;
}
static struct platform_driver max8925_power_driver = {
.probe = max8925_power_probe,
- .remove = max8925_power_remove,
+ .remove_new = max8925_power_remove,
.driver = {
.name = "max8925-power",
},