Skip to content

Commit 9d7edaa

Browse files
Uwe Kleine-Königherbertx
authored andcommitted
hwrng: xgene - Convert to platform remove callback returning void
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> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent b74bc79 commit 9d7edaa

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/char/hw_random/xgene-rng.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,15 +357,13 @@ static int xgene_rng_probe(struct platform_device *pdev)
357357
return 0;
358358
}
359359

360-
static int xgene_rng_remove(struct platform_device *pdev)
360+
static void xgene_rng_remove(struct platform_device *pdev)
361361
{
362362
int rc;
363363

364364
rc = device_init_wakeup(&pdev->dev, 0);
365365
if (rc)
366366
dev_err(&pdev->dev, "RNG init wakeup failed error %d\n", rc);
367-
368-
return 0;
369367
}
370368

371369
static const struct of_device_id xgene_rng_of_match[] = {
@@ -377,7 +375,7 @@ MODULE_DEVICE_TABLE(of, xgene_rng_of_match);
377375

378376
static struct platform_driver xgene_rng_driver = {
379377
.probe = xgene_rng_probe,
380-
.remove = xgene_rng_remove,
378+
.remove_new = xgene_rng_remove,
381379
.driver = {
382380
.name = "xgene-rng",
383381
.of_match_table = xgene_rng_of_match,

0 commit comments

Comments
 (0)