Skip to content

Commit 83ef1db

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

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/power/supply/twl4030_charger.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ static int twl4030_bci_probe(struct platform_device *pdev)
11081108
return 0;
11091109
}
11101110

1111-
static int twl4030_bci_remove(struct platform_device *pdev)
1111+
static void twl4030_bci_remove(struct platform_device *pdev)
11121112
{
11131113
struct twl4030_bci *bci = platform_get_drvdata(pdev);
11141114

@@ -1123,8 +1123,6 @@ static int twl4030_bci_remove(struct platform_device *pdev)
11231123
TWL4030_INTERRUPTS_BCIIMR1A);
11241124
twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff,
11251125
TWL4030_INTERRUPTS_BCIIMR2A);
1126-
1127-
return 0;
11281126
}
11291127

11301128
static const struct of_device_id twl_bci_of_match[] __maybe_unused = {
@@ -1135,7 +1133,7 @@ MODULE_DEVICE_TABLE(of, twl_bci_of_match);
11351133

11361134
static struct platform_driver twl4030_bci_driver = {
11371135
.probe = twl4030_bci_probe,
1138-
.remove = twl4030_bci_remove,
1136+
.remove_new = twl4030_bci_remove,
11391137
.driver = {
11401138
.name = "twl4030_bci",
11411139
.of_match_table = of_match_ptr(twl_bci_of_match),

0 commit comments

Comments
 (0)