Skip to content

Commit 37a432c

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: navpoint - 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-29-u.kleine-koenig@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent ee3d559 commit 37a432c

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/input/mouse/navpoint.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static int navpoint_probe(struct platform_device *pdev)
295295
return error;
296296
}
297297

298-
static int navpoint_remove(struct platform_device *pdev)
298+
static void navpoint_remove(struct platform_device *pdev)
299299
{
300300
const struct navpoint_platform_data *pdata =
301301
dev_get_platdata(&pdev->dev);
@@ -311,8 +311,6 @@ static int navpoint_remove(struct platform_device *pdev)
311311

312312
if (gpio_is_valid(pdata->gpio))
313313
gpio_free(pdata->gpio);
314-
315-
return 0;
316314
}
317315

318316
static int navpoint_suspend(struct device *dev)
@@ -348,7 +346,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(navpoint_pm_ops,
348346

349347
static struct platform_driver navpoint_driver = {
350348
.probe = navpoint_probe,
351-
.remove = navpoint_remove,
349+
.remove_new = navpoint_remove,
352350
.driver = {
353351
.name = "navpoint",
354352
.pm = pm_sleep_ptr(&navpoint_pm_ops),

0 commit comments

Comments
 (0)