]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Input: wm97xx - make .remove() obviously always return 0
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 8 Jul 2022 20:19:19 +0000 (13:19 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 8 Jul 2022 20:19:53 +0000 (13:19 -0700)
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>
drivers/input/touchscreen/wm97xx-core.c

index 1b58611c808406da9c5a22f070491adedb55b9cb..a466e8c56462f10fa151c33cb872cf99d6ba46e2 100644 (file)
@@ -786,7 +786,9 @@ batt_err:
 
 static int wm97xx_mfd_remove(struct platform_device *pdev)
 {
-       return wm97xx_remove(&pdev->dev);
+       wm97xx_remove(&pdev->dev);
+
+       return 0;
 }
 
 static int __maybe_unused wm97xx_suspend(struct device *dev)