| Message ID | 20230326143224.572654-117-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | 19136807ad6931f2a3bc92dc9aa3deb29024b0c3 |
| Headers | show |
| Series | media: Convert to platform remove callback returning void | expand |
Quoting Uwe Kleine-König (2023-03-26 15:32:21) > 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: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > drivers/media/test-drivers/vimc/vimc-core.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/test-drivers/vimc/vimc-core.c b/drivers/media/test-drivers/vimc/vimc-core.c > index e82cfa5ffbf4..af127476e920 100644 > --- a/drivers/media/test-drivers/vimc/vimc-core.c > +++ b/drivers/media/test-drivers/vimc/vimc-core.c > @@ -387,7 +387,7 @@ static int vimc_probe(struct platform_device *pdev) > return 0; > } > > -static int vimc_remove(struct platform_device *pdev) > +static void vimc_remove(struct platform_device *pdev) > { > struct vimc_device *vimc = platform_get_drvdata(pdev); > > @@ -397,8 +397,6 @@ static int vimc_remove(struct platform_device *pdev) > media_device_unregister(&vimc->mdev); > v4l2_device_unregister(&vimc->v4l2_dev); > v4l2_device_put(&vimc->v4l2_dev); > - > - return 0; > } > > static void vimc_dev_release(struct device *dev) > @@ -412,7 +410,7 @@ static struct platform_device vimc_pdev = { > > static struct platform_driver vimc_pdrv = { > .probe = vimc_probe, > - .remove = vimc_remove, > + .remove_new = vimc_remove, > .driver = { > .name = VIMC_PDEV_NAME, > }, > -- > 2.39.2 >
diff --git a/drivers/media/test-drivers/vimc/vimc-core.c b/drivers/media/test-drivers/vimc/vimc-core.c index e82cfa5ffbf4..af127476e920 100644 --- a/drivers/media/test-drivers/vimc/vimc-core.c +++ b/drivers/media/test-drivers/vimc/vimc-core.c @@ -387,7 +387,7 @@ static int vimc_probe(struct platform_device *pdev) return 0; } -static int vimc_remove(struct platform_device *pdev) +static void vimc_remove(struct platform_device *pdev) { struct vimc_device *vimc = platform_get_drvdata(pdev); @@ -397,8 +397,6 @@ static int vimc_remove(struct platform_device *pdev) media_device_unregister(&vimc->mdev); v4l2_device_unregister(&vimc->v4l2_dev); v4l2_device_put(&vimc->v4l2_dev); - - return 0; } static void vimc_dev_release(struct device *dev) @@ -412,7 +410,7 @@ static struct platform_device vimc_pdev = { static struct platform_driver vimc_pdrv = { .probe = vimc_probe, - .remove = vimc_remove, + .remove_new = vimc_remove, .driver = { .name = VIMC_PDEV_NAME, },
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/media/test-drivers/vimc/vimc-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)