On 2023/10/20 15:55, 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@xxxxxxxxxxxxxx>
> ---
> drivers/crypto/hisilicon/trng/trng.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/crypto/hisilicon/trng/trng.c b/drivers/crypto/hisilicon/trng/trng.c
> index 97e500db0a82..451b167bcc73 100644
> --- a/drivers/crypto/hisilicon/trng/trng.c
> +++ b/drivers/crypto/hisilicon/trng/trng.c
> @@ -303,7 +303,7 @@ static int hisi_trng_probe(struct platform_device *pdev)
> return ret;
> }
>
> -static int hisi_trng_remove(struct platform_device *pdev)
> +static void hisi_trng_remove(struct platform_device *pdev)
> {
> struct hisi_trng *trng = platform_get_drvdata(pdev);
>
> @@ -314,8 +314,6 @@ static int hisi_trng_remove(struct platform_device *pdev)
> if (trng->ver != HISI_TRNG_VER_V1 &&
> atomic_dec_return(&trng_active_devs) == 0)
> crypto_unregister_rng(&hisi_trng_alg);
> -
> - return 0;
> }
>
> static const struct acpi_device_id hisi_trng_acpi_match[] = {
> @@ -326,7 +324,7 @@ MODULE_DEVICE_TABLE(acpi, hisi_trng_acpi_match);
>
> static struct platform_driver hisi_trng_driver = {
> .probe = hisi_trng_probe,
> - .remove = hisi_trng_remove,
> + .remove_new = hisi_trng_remove,
> .driver = {
> .name = "hisi-trng-v2",
> .acpi_match_table = ACPI_PTR(hisi_trng_acpi_match),
>
Reviewed-by: Weili Qian <qianweili@xxxxxxxxxx>
Thanks,
Weili
