Skip to content

Commit 12dc6ad

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: wm97xx - make .remove() obviously always return 0
wm97xx_remove() returns zero unconditionally. To prepare changing the prototype for platform remove callbacks to return void, make it explicit that wm97xx_mfd_remove() always returns zero. The prototype for wm97xx_remove cannot be changed, as it's also used as a plain device remove callback. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20220708062718.240013-1-u.kleine-koenig@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 039d4ed commit 12dc6ad

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/input/touchscreen/wm97xx-core.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,9 @@ static int wm97xx_mfd_probe(struct platform_device *pdev)
786786

787787
static int wm97xx_mfd_remove(struct platform_device *pdev)
788788
{
789-
return wm97xx_remove(&pdev->dev);
789+
wm97xx_remove(&pdev->dev);
790+
791+
return 0;
790792
}
791793

792794
static int __maybe_unused wm97xx_suspend(struct device *dev)

0 commit comments

Comments
 (0)