Skip to content

Commit c50fdc4

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: wm97xx-core - 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]> Acked-by: Charles Keepax <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 33984b4 commit c50fdc4

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/input/touchscreen/wm97xx-core.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -756,11 +756,9 @@ static int wm97xx_mfd_probe(struct platform_device *pdev)
756756
return ret;
757757
}
758758

759-
static int wm97xx_mfd_remove(struct platform_device *pdev)
759+
static void wm97xx_mfd_remove(struct platform_device *pdev)
760760
{
761761
wm97xx_remove(&pdev->dev);
762-
763-
return 0;
764762
}
765763

766764
static int wm97xx_suspend(struct device *dev)
@@ -878,7 +876,7 @@ static struct platform_driver wm97xx_mfd_driver = {
878876
.pm = pm_sleep_ptr(&wm97xx_pm_ops),
879877
},
880878
.probe = wm97xx_mfd_probe,
881-
.remove = wm97xx_mfd_remove,
879+
.remove_new = wm97xx_mfd_remove,
882880
};
883881

884882
static int __init wm97xx_init(void)

0 commit comments

Comments
 (0)