| Message ID | 20231020075521.2121571-61-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: Convert to platform remove callback returning void | expand |
Le Fri, Oct 20, 2023 at 09:55:39AM +0200, Uwe Kleine-König a écrit : > 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/crypto/gemini/sl3516-ce-core.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/crypto/gemini/sl3516-ce-core.c b/drivers/crypto/gemini/sl3516-ce-core.c > index 0f43c6e39bb9..1d1a889599bb 100644 > --- a/drivers/crypto/gemini/sl3516-ce-core.c > +++ b/drivers/crypto/gemini/sl3516-ce-core.c > @@ -505,7 +505,7 @@ static int sl3516_ce_probe(struct platform_device *pdev) > return err; > } > > -static int sl3516_ce_remove(struct platform_device *pdev) > +static void sl3516_ce_remove(struct platform_device *pdev) > { > struct sl3516_ce_dev *ce = platform_get_drvdata(pdev); > > @@ -518,8 +518,6 @@ static int sl3516_ce_remove(struct platform_device *pdev) > #ifdef CONFIG_CRYPTO_DEV_SL3516_DEBUG > debugfs_remove_recursive(ce->dbgfs_dir); > #endif > - > - return 0; > } > > static const struct of_device_id sl3516_ce_crypto_of_match_table[] = { > @@ -530,7 +528,7 @@ MODULE_DEVICE_TABLE(of, sl3516_ce_crypto_of_match_table); > > static struct platform_driver sl3516_ce_driver = { > .probe = sl3516_ce_probe, > - .remove = sl3516_ce_remove, > + .remove_new = sl3516_ce_remove, > .driver = { > .name = "sl3516-crypto", > .pm = &sl3516_ce_pm_ops, > -- > 2.42.0 > Acked-by: Corentin Labbe <clabbe@baylibre.com> Thanks
diff --git a/drivers/crypto/gemini/sl3516-ce-core.c b/drivers/crypto/gemini/sl3516-ce-core.c index 0f43c6e39bb9..1d1a889599bb 100644 --- a/drivers/crypto/gemini/sl3516-ce-core.c +++ b/drivers/crypto/gemini/sl3516-ce-core.c @@ -505,7 +505,7 @@ static int sl3516_ce_probe(struct platform_device *pdev) return err; } -static int sl3516_ce_remove(struct platform_device *pdev) +static void sl3516_ce_remove(struct platform_device *pdev) { struct sl3516_ce_dev *ce = platform_get_drvdata(pdev); @@ -518,8 +518,6 @@ static int sl3516_ce_remove(struct platform_device *pdev) #ifdef CONFIG_CRYPTO_DEV_SL3516_DEBUG debugfs_remove_recursive(ce->dbgfs_dir); #endif - - return 0; } static const struct of_device_id sl3516_ce_crypto_of_match_table[] = { @@ -530,7 +528,7 @@ MODULE_DEVICE_TABLE(of, sl3516_ce_crypto_of_match_table); static struct platform_driver sl3516_ce_driver = { .probe = sl3516_ce_probe, - .remove = sl3516_ce_remove, + .remove_new = sl3516_ce_remove, .driver = { .name = "sl3516-crypto", .pm = &sl3516_ce_pm_ops,
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/crypto/gemini/sl3516-ce-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)