Skip to content

Commit 75d8365

Browse files
Uwe Kleine-Königsre
authored andcommitted
power: supply: tps65090-charger: 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-26-u.kleine-koenig@pengutronix.de Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 0569d4c commit 75d8365

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/power/supply/tps65090-charger.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,15 +328,13 @@ static int tps65090_charger_probe(struct platform_device *pdev)
328328
return ret;
329329
}
330330

331-
static int tps65090_charger_remove(struct platform_device *pdev)
331+
static void tps65090_charger_remove(struct platform_device *pdev)
332332
{
333333
struct tps65090_charger *cdata = platform_get_drvdata(pdev);
334334

335335
if (cdata->irq == -ENXIO)
336336
kthread_stop(cdata->poll_task);
337337
power_supply_unregister(cdata->ac);
338-
339-
return 0;
340338
}
341339

342340
static const struct of_device_id of_tps65090_charger_match[] = {
@@ -351,7 +349,7 @@ static struct platform_driver tps65090_charger_driver = {
351349
.of_match_table = of_tps65090_charger_match,
352350
},
353351
.probe = tps65090_charger_probe,
354-
.remove = tps65090_charger_remove,
352+
.remove_new = tps65090_charger_remove,
355353
};
356354
module_platform_driver(tps65090_charger_driver);
357355

0 commit comments

Comments
 (0)