| Message ID | 20230920125829.1478827-43-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e453a3e6d4024e46c9bc86ce5c61dda536800293 |
| Headers | show |
| Series | input: Convert to platform remove callback returning void | expand |
Dne sreda, 20. september 2023 ob 14:58:19 CEST je Uwe Kleine-König napisal(a): > 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: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > --- > drivers/input/serio/sun4i-ps2.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/serio/sun4i-ps2.c > b/drivers/input/serio/sun4i-ps2.c index eb262640192e..aec66d9f5176 100644 > --- a/drivers/input/serio/sun4i-ps2.c > +++ b/drivers/input/serio/sun4i-ps2.c > @@ -297,7 +297,7 @@ static int sun4i_ps2_probe(struct platform_device *pdev) > return error; > } > > -static int sun4i_ps2_remove(struct platform_device *pdev) > +static void sun4i_ps2_remove(struct platform_device *pdev) > { > struct sun4i_ps2data *drvdata = platform_get_drvdata(pdev); > > @@ -311,8 +311,6 @@ static int sun4i_ps2_remove(struct platform_device > *pdev) iounmap(drvdata->reg_base); > > kfree(drvdata); > - > - return 0; > } > > static const struct of_device_id sun4i_ps2_match[] = { > @@ -324,7 +322,7 @@ MODULE_DEVICE_TABLE(of, sun4i_ps2_match); > > static struct platform_driver sun4i_ps2_driver = { > .probe = sun4i_ps2_probe, > - .remove = sun4i_ps2_remove, > + .remove_new = sun4i_ps2_remove, > .driver = { > .name = DRIVER_NAME, > .of_match_table = sun4i_ps2_match,
diff --git a/drivers/input/serio/sun4i-ps2.c b/drivers/input/serio/sun4i-ps2.c index eb262640192e..aec66d9f5176 100644 --- a/drivers/input/serio/sun4i-ps2.c +++ b/drivers/input/serio/sun4i-ps2.c @@ -297,7 +297,7 @@ static int sun4i_ps2_probe(struct platform_device *pdev) return error; } -static int sun4i_ps2_remove(struct platform_device *pdev) +static void sun4i_ps2_remove(struct platform_device *pdev) { struct sun4i_ps2data *drvdata = platform_get_drvdata(pdev); @@ -311,8 +311,6 @@ static int sun4i_ps2_remove(struct platform_device *pdev) iounmap(drvdata->reg_base); kfree(drvdata); - - return 0; } static const struct of_device_id sun4i_ps2_match[] = { @@ -324,7 +322,7 @@ MODULE_DEVICE_TABLE(of, sun4i_ps2_match); static struct platform_driver sun4i_ps2_driver = { .probe = sun4i_ps2_probe, - .remove = sun4i_ps2_remove, + .remove_new = sun4i_ps2_remove, .driver = { .name = DRIVER_NAME, .of_match_table = sun4i_ps2_match,
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> --- drivers/input/serio/sun4i-ps2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)