Skip to content

Commit 07a9398

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

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/power/supply/tps65217_charger.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,12 @@ static int tps65217_charger_probe(struct platform_device *pdev)
253253
return 0;
254254
}
255255

256-
static int tps65217_charger_remove(struct platform_device *pdev)
256+
static void tps65217_charger_remove(struct platform_device *pdev)
257257
{
258258
struct tps65217_charger *charger = platform_get_drvdata(pdev);
259259

260260
if (charger->poll_task)
261261
kthread_stop(charger->poll_task);
262-
263-
return 0;
264262
}
265263

266264
static const struct of_device_id tps65217_charger_match_table[] = {
@@ -271,7 +269,7 @@ MODULE_DEVICE_TABLE(of, tps65217_charger_match_table);
271269

272270
static struct platform_driver tps65217_charger_driver = {
273271
.probe = tps65217_charger_probe,
274-
.remove = tps65217_charger_remove,
272+
.remove_new = tps65217_charger_remove,
275273
.driver = {
276274
.name = "tps65217-charger",
277275
.of_match_table = of_match_ptr(tps65217_charger_match_table),

0 commit comments

Comments
 (0)