Skip to content

Commit 57f534c

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: i8042-sparcio - convert to platform remove callback returning void
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> Link: https://lore.kernel.org/r/20230920125829.1478827-35-u.kleine-koenig@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 508366d commit 57f534c

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/input/serio/i8042-sparcio.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,9 @@ static int sparc_i8042_probe(struct platform_device *op)
8282
return 0;
8383
}
8484

85-
static int sparc_i8042_remove(struct platform_device *op)
85+
static void sparc_i8042_remove(struct platform_device *op)
8686
{
8787
of_iounmap(kbd_res, kbd_iobase, 8);
88-
89-
return 0;
9088
}
9189

9290
static const struct of_device_id sparc_i8042_match[] = {
@@ -103,7 +101,7 @@ static struct platform_driver sparc_i8042_driver = {
103101
.of_match_table = sparc_i8042_match,
104102
},
105103
.probe = sparc_i8042_probe,
106-
.remove = sparc_i8042_remove,
104+
.remove_new = sparc_i8042_remove,
107105
};
108106

109107
static bool i8042_is_mr_coffee(void)

0 commit comments

Comments
 (0)