Input: wm831x-ts - convert to platform remove callback returning void
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 20 Sep 2023 12:58:28 +0000 (14:58 +0200)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 24 Sep 2023 02:28:17 +0000 (19:28 -0700)
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 <u.kleine-koenig@pengutronix.de>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230920125829.1478827-52-u.kleine-koenig@pengutronix.de
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/wm831x-ts.c

index 319f57fb9af52805bd143ba25f55e1650cd05c7a..9cee26b63341df1403f5a966c898cccab4e75ff5 100644 (file)
@@ -374,14 +374,12 @@ err_alloc:
        return error;
 }
 
-static int wm831x_ts_remove(struct platform_device *pdev)
+static void wm831x_ts_remove(struct platform_device *pdev)
 {
        struct wm831x_ts *wm831x_ts = platform_get_drvdata(pdev);
 
        free_irq(wm831x_ts->pd_irq, wm831x_ts);
        free_irq(wm831x_ts->data_irq, wm831x_ts);
-
-       return 0;
 }
 
 static struct platform_driver wm831x_ts_driver = {
@@ -389,7 +387,7 @@ static struct platform_driver wm831x_ts_driver = {
                .name = "wm831x-touch",
        },
        .probe = wm831x_ts_probe,
-       .remove = wm831x_ts_remove,
+       .remove_new = wm831x_ts_remove,
 };
 module_platform_driver(wm831x_ts_driver);