| Message ID | 817e91f7bb257745c0fb483037b83c1a6ba14e75.1702245873.git.u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | hwrng: Convert to platform remove callback returning | expand |
It was <2023-12-10 nie 23:12>, when 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 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/char/hw_random/exynos-trng.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > Acked-by: Lukasz Stelmach <l.stelmach@samsung.com> > diff --git a/drivers/char/hw_random/exynos-trng.c b/drivers/char/hw_random/exynos-trng.c > index 30207b7ac5f4..0ed5d22fe667 100644 > --- a/drivers/char/hw_random/exynos-trng.c > +++ b/drivers/char/hw_random/exynos-trng.c > @@ -173,7 +173,7 @@ static int exynos_trng_probe(struct platform_device *pdev) > return ret; > } > > -static int exynos_trng_remove(struct platform_device *pdev) > +static void exynos_trng_remove(struct platform_device *pdev) > { > struct exynos_trng_dev *trng = platform_get_drvdata(pdev); > > @@ -181,8 +181,6 @@ static int exynos_trng_remove(struct platform_device *pdev) > > pm_runtime_put_sync(&pdev->dev); > pm_runtime_disable(&pdev->dev); > - > - return 0; > } > > static int exynos_trng_suspend(struct device *dev) > @@ -223,7 +221,7 @@ static struct platform_driver exynos_trng_driver = { > .of_match_table = exynos_trng_dt_match, > }, > .probe = exynos_trng_probe, > - .remove = exynos_trng_remove, > + .remove_new = exynos_trng_remove, > }; > > module_platform_driver(exynos_trng_driver);
diff --git a/drivers/char/hw_random/exynos-trng.c b/drivers/char/hw_random/exynos-trng.c index 30207b7ac5f4..0ed5d22fe667 100644 --- a/drivers/char/hw_random/exynos-trng.c +++ b/drivers/char/hw_random/exynos-trng.c @@ -173,7 +173,7 @@ static int exynos_trng_probe(struct platform_device *pdev) return ret; } -static int exynos_trng_remove(struct platform_device *pdev) +static void exynos_trng_remove(struct platform_device *pdev) { struct exynos_trng_dev *trng = platform_get_drvdata(pdev); @@ -181,8 +181,6 @@ static int exynos_trng_remove(struct platform_device *pdev) pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); - - return 0; } static int exynos_trng_suspend(struct device *dev) @@ -223,7 +221,7 @@ static struct platform_driver exynos_trng_driver = { .of_match_table = exynos_trng_dt_match, }, .probe = exynos_trng_probe, - .remove = exynos_trng_remove, + .remove_new = exynos_trng_remove, }; module_platform_driver(exynos_trng_driver);
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/char/hw_random/exynos-trng.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)