Skip to content

Commit

Permalink
Input: wm97xx - make .remove() obviously always return 0
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Uwe Kleine-König authored and Dmitry Torokhov committed Jul 8, 2022
1 parent 039d4ed commit 12dc6ad
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/input/touchscreen/wm97xx-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,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)
Expand Down

0 comments on commit 12dc6ad

Please sign in to comment.