Skip to content

Commit da93e8a

Browse files
Uwe Kleine-Königdtor
authored andcommitted
Input: arc_ps2 - 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-33-u.kleine-koenig@pengutronix.de Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 15514b9 commit da93e8a

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/input/serio/arc_ps2.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static int arc_ps2_probe(struct platform_device *pdev)
232232
return 0;
233233
}
234234

235-
static int arc_ps2_remove(struct platform_device *pdev)
235+
static void arc_ps2_remove(struct platform_device *pdev)
236236
{
237237
struct arc_ps2_data *arc_ps2 = platform_get_drvdata(pdev);
238238
int i;
@@ -244,8 +244,6 @@ static int arc_ps2_remove(struct platform_device *pdev)
244244
dev_dbg(&pdev->dev, "frame error count = %i\n", arc_ps2->frame_error);
245245
dev_dbg(&pdev->dev, "buffer overflow count = %i\n",
246246
arc_ps2->buf_overflow);
247-
248-
return 0;
249247
}
250248

251249
#ifdef CONFIG_OF
@@ -262,7 +260,7 @@ static struct platform_driver arc_ps2_driver = {
262260
.of_match_table = of_match_ptr(arc_ps2_match),
263261
},
264262
.probe = arc_ps2_probe,
265-
.remove = arc_ps2_remove,
263+
.remove_new = arc_ps2_remove,
266264
};
267265

268266
module_platform_driver(arc_ps2_driver);

0 commit comments

Comments
 (0)