Skip to content

Commit fc7b34a

Browse files
Uwe Kleine-Königsre
authored andcommitted
power: supply: wm831x_backup: 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-30-u.kleine-koenig@pengutronix.de Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent ac51982 commit fc7b34a

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/power/supply/wm831x_backup.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,16 @@ static int wm831x_backup_probe(struct platform_device *pdev)
197197
return PTR_ERR_OR_ZERO(devdata->backup);
198198
}
199199

200-
static int wm831x_backup_remove(struct platform_device *pdev)
200+
static void wm831x_backup_remove(struct platform_device *pdev)
201201
{
202202
struct wm831x_backup *devdata = platform_get_drvdata(pdev);
203203

204204
power_supply_unregister(devdata->backup);
205-
206-
return 0;
207205
}
208206

209207
static struct platform_driver wm831x_backup_driver = {
210208
.probe = wm831x_backup_probe,
211-
.remove = wm831x_backup_remove,
209+
.remove_new = wm831x_backup_remove,
212210
.driver = {
213211
.name = "wm831x-backup",
214212
},

0 commit comments

Comments
 (0)