Commit c0274e4f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by JangShui Yang
Browse files

crypto: hisilicon/trng - Convert to platform remove callback returning void 

mainline inclusion
from mainline-v6.7-rc1
commit 151356ceb974b93106159f0368b6ab1f1699031a
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I925L9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=151356ceb974b93106159f0368b6ab1f1699031a



----------------------------------------------------------------------

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarWeili Qian <qianweili@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJangShui Yang <yangjiangshui@h-partners.com>
parent f43b7be8

drivers/crypto/hisilicon/trng/trng.c

+2 −4
Original line number Diff line number Diff line
@@ -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),