| Message ID | 20231020075521.2121571-66-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:44AM +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/intel/ixp4xx/ixp4xx_crypto.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c b/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c > index 4a18095ae5d8..f8a77bff8844 100644 > --- a/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c > +++ b/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c > @@ -1563,7 +1563,7 @@ static int ixp_crypto_probe(struct platform_device *_pdev) > return 0; > } > > -static int ixp_crypto_remove(struct platform_device *pdev) > +static void ixp_crypto_remove(struct platform_device *pdev) > { > int num = ARRAY_SIZE(ixp4xx_algos); > int i; > @@ -1578,8 +1578,6 @@ static int ixp_crypto_remove(struct platform_device *pdev) > crypto_unregister_skcipher(&ixp4xx_algos[i].crypto); > } > release_ixp_crypto(&pdev->dev); > - > - return 0; > } > static const struct of_device_id ixp4xx_crypto_of_match[] = { > { > @@ -1590,7 +1588,7 @@ static const struct of_device_id ixp4xx_crypto_of_match[] = { > > static struct platform_driver ixp_crypto_driver = { > .probe = ixp_crypto_probe, > - .remove = ixp_crypto_remove, > + .remove_new = ixp_crypto_remove, > .driver = { > .name = "ixp4xx_crypto", > .of_match_table = ixp4xx_crypto_of_match, > -- > 2.42.0 > Acked-by: Corentin Labbe <clabbe@baylibre.com> Thanks
diff --git a/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c b/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c index 4a18095ae5d8..f8a77bff8844 100644 --- a/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c +++ b/drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c @@ -1563,7 +1563,7 @@ static int ixp_crypto_probe(struct platform_device *_pdev) return 0; } -static int ixp_crypto_remove(struct platform_device *pdev) +static void ixp_crypto_remove(struct platform_device *pdev) { int num = ARRAY_SIZE(ixp4xx_algos); int i; @@ -1578,8 +1578,6 @@ static int ixp_crypto_remove(struct platform_device *pdev) crypto_unregister_skcipher(&ixp4xx_algos[i].crypto); } release_ixp_crypto(&pdev->dev); - - return 0; } static const struct of_device_id ixp4xx_crypto_of_match[] = { { @@ -1590,7 +1588,7 @@ static const struct of_device_id ixp4xx_crypto_of_match[] = { static struct platform_driver ixp_crypto_driver = { .probe = ixp_crypto_probe, - .remove = ixp_crypto_remove, + .remove_new = ixp_crypto_remove, .driver = { .name = "ixp4xx_crypto", .of_match_table = ixp4xx_crypto_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 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/intel/ixp4xx/ixp4xx_crypto.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)