Skip to content

Commit 0bf7207

Browse files
Uwe Kleine-Königsre
authored andcommitted
power: reset: tps65086-restart: 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() will be renamed to .remove(). Returning an error if unregister_restart_handler() failed has no effect but triggering another error message. So converting this driver to .remove_new() has no effect but to suppress the duplicated error message. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20231104211501.3676352-30-u.kleine-koenig@pengutronix.de Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 2973706 commit 0bf7207

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/power/reset/tps65086-restart.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,21 @@ static int tps65086_restart_probe(struct platform_device *pdev)
6262
return 0;
6363
}
6464

65-
static int tps65086_restart_remove(struct platform_device *pdev)
65+
static void tps65086_restart_remove(struct platform_device *pdev)
6666
{
6767
struct tps65086_restart *tps65086_restart = platform_get_drvdata(pdev);
6868
int ret;
6969

7070
ret = unregister_restart_handler(&tps65086_restart->handler);
7171
if (ret) {
72+
/*
73+
* tps65086_restart_probe() registered the restart handler. So
74+
* unregistering should work fine. Checking the error code
75+
* shouldn't be needed, still doing it for completeness.
76+
*/
7277
dev_err(&pdev->dev, "%s: cannot unregister restart handler: %d\n",
7378
__func__, ret);
74-
return -ENODEV;
7579
}
76-
77-
return 0;
7880
}
7981

8082
static const struct platform_device_id tps65086_restart_id_table[] = {
@@ -88,7 +90,7 @@ static struct platform_driver tps65086_restart_driver = {
8890
.name = "tps65086-restart",
8991
},
9092
.probe = tps65086_restart_probe,
91-
.remove = tps65086_restart_remove,
93+
.remove_new = tps65086_restart_remove,
9294
.id_table = tps65086_restart_id_table,
9395
};
9496
module_platform_driver(tps65086_restart_driver);

0 commit comments

Comments
 (0)