Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

power: supply: goldfish_battery: 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-14-u.kleine-koenig@pengutronix.de
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

Uwe Kleine-König and committed by
Sebastian Reichel
df1953bc 749e18a8

+2 -3
+2 -3
drivers/power/supply/goldfish_battery.c
··· 249 249 return 0; 250 250 } 251 251 252 - static int goldfish_battery_remove(struct platform_device *pdev) 252 + static void goldfish_battery_remove(struct platform_device *pdev) 253 253 { 254 254 struct goldfish_battery_data *data = platform_get_drvdata(pdev); 255 255 256 256 power_supply_unregister(data->battery); 257 257 power_supply_unregister(data->ac); 258 - return 0; 259 258 } 260 259 261 260 static const struct of_device_id goldfish_battery_of_match[] = { ··· 273 274 274 275 static struct platform_driver goldfish_battery_device = { 275 276 .probe = goldfish_battery_probe, 276 - .remove = goldfish_battery_remove, 277 + .remove_new = goldfish_battery_remove, 277 278 .driver = { 278 279 .name = "goldfish-battery", 279 280 .of_match_table = goldfish_battery_of_match,