[PATCH] Input: wm97xx: Make .remove() obviously always return 0

[PATCH] Input: wm97xx: Make .remove() obviously always return 0

[Uwe Kleine-König]

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>
---
 drivers/input/touchscreen/wm97xx-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index 2757c7768ffe..f51ab5614532 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -758,7 +758,9 @@ static int wm97xx_mfd_probe(struct platform_device *pdev)
 
 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)

base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
-- 
2.36.1

Re: [PATCH] Input: wm97xx: Make .remove() obviously always return 0

[Dmitry Torokhov]

On Fri, Jul 08, 2022 at 08:27:18AM +0200, Uwe Kleine-König wrote:
> 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>

Applied, thank you.

-- 
Dmitry