Skip to content

Commit ad43716

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: wistron_btns - 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(). 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/20230920125829.1478827-27-u.kleine-koenig@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent c55fb97 commit ad43716

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/input/misc/wistron_btns.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,13 +1286,11 @@ static int wistron_probe(struct platform_device *dev)
12861286
return 0;
12871287
}
12881288

1289-
static int wistron_remove(struct platform_device *dev)
1289+
static void wistron_remove(struct platform_device *dev)
12901290
{
12911291
wistron_led_remove();
12921292
input_unregister_device(wistron_idev);
12931293
bios_detach();
1294-
1295-
return 0;
12961294
}
12971295

12981296
static int wistron_suspend(struct device *dev)
@@ -1336,7 +1334,7 @@ static struct platform_driver wistron_driver = {
13361334
.pm = pm_sleep_ptr(&wistron_pm_ops),
13371335
},
13381336
.probe = wistron_probe,
1339-
.remove = wistron_remove,
1337+
.remove_new = wistron_remove,
13401338
};
13411339

13421340
static int __init wb_module_init(void)

0 commit comments

Comments
 (0)