Skip to content

Commit d722a70

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: ti_am335x_tsc - 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 1b1904f commit d722a70

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/input/touchscreen/ti_am335x_tsc.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ static int titsc_probe(struct platform_device *pdev)
491491
return err;
492492
}
493493

494-
static int titsc_remove(struct platform_device *pdev)
494+
static void titsc_remove(struct platform_device *pdev)
495495
{
496496
struct titsc *ts_dev = platform_get_drvdata(pdev);
497497
u32 steps;
@@ -508,7 +508,6 @@ static int titsc_remove(struct platform_device *pdev)
508508
input_unregister_device(ts_dev->input);
509509

510510
kfree(ts_dev);
511-
return 0;
512511
}
513512

514513
static int titsc_suspend(struct device *dev)
@@ -552,7 +551,7 @@ MODULE_DEVICE_TABLE(of, ti_tsc_dt_ids);
552551

553552
static struct platform_driver ti_tsc_driver = {
554553
.probe = titsc_probe,
555-
.remove = titsc_remove,
554+
.remove_new = titsc_remove,
556555
.driver = {
557556
.name = "TI-am335x-tsc",
558557
.pm = pm_sleep_ptr(&titsc_pm_ops),

0 commit comments

Comments
 (0)