| Message ID | 20230403154014.2564054-17-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: Convert to platform remove callback returning void | expand |
Hi, On Mon 03 Apr 23, 17:40, Uwe Kleine-König wrote: > 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 (mostly) ignored > 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. > > 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> Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Thanks, Paul > --- > drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > index 7b7947509b69..0dc75adbd9d8 100644 > --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c > @@ -493,7 +493,7 @@ static int sun6i_isp_probe(struct platform_device *platform_dev) > return ret; > } > > -static int sun6i_isp_remove(struct platform_device *platform_dev) > +static void sun6i_isp_remove(struct platform_device *platform_dev) > { > struct sun6i_isp_device *isp_dev = platform_get_drvdata(platform_dev); > > @@ -503,8 +503,6 @@ static int sun6i_isp_remove(struct platform_device *platform_dev) > sun6i_isp_v4l2_cleanup(isp_dev); > sun6i_isp_tables_cleanup(isp_dev); > sun6i_isp_resources_cleanup(isp_dev); > - > - return 0; > } > > /* > @@ -540,7 +538,7 @@ MODULE_DEVICE_TABLE(of, sun6i_isp_of_match); > > static struct platform_driver sun6i_isp_platform_driver = { > .probe = sun6i_isp_probe, > - .remove = sun6i_isp_remove, > + .remove_new = sun6i_isp_remove, > .driver = { > .name = SUN6I_ISP_NAME, > .of_match_table = of_match_ptr(sun6i_isp_of_match), > -- > 2.39.2 >
Dne ponedeljek, 03. april 2023 ob 17:40:06 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 (mostly) ignored > 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. > > 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
diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c index 7b7947509b69..0dc75adbd9d8 100644 --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c @@ -493,7 +493,7 @@ static int sun6i_isp_probe(struct platform_device *platform_dev) return ret; } -static int sun6i_isp_remove(struct platform_device *platform_dev) +static void sun6i_isp_remove(struct platform_device *platform_dev) { struct sun6i_isp_device *isp_dev = platform_get_drvdata(platform_dev); @@ -503,8 +503,6 @@ static int sun6i_isp_remove(struct platform_device *platform_dev) sun6i_isp_v4l2_cleanup(isp_dev); sun6i_isp_tables_cleanup(isp_dev); sun6i_isp_resources_cleanup(isp_dev); - - return 0; } /* @@ -540,7 +538,7 @@ MODULE_DEVICE_TABLE(of, sun6i_isp_of_match); static struct platform_driver sun6i_isp_platform_driver = { .probe = sun6i_isp_probe, - .remove = sun6i_isp_remove, + .remove_new = sun6i_isp_remove, .driver = { .name = SUN6I_ISP_NAME, .of_match_table = of_match_ptr(sun6i_isp_of_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 (mostly) ignored 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. 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/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)