Skip to content

Commit 032ca4f

Browse files
Uwe Kleine-Königdavem330
authored andcommitted
net: mdio: 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() is 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: David S. Miller <davem@davemloft.net>
1 parent efd8d90 commit 032ca4f

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/net/mdio/mdio-xgene.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static int xgene_mdio_probe(struct platform_device *pdev)
432432
return ret;
433433
}
434434

435-
static int xgene_mdio_remove(struct platform_device *pdev)
435+
static void xgene_mdio_remove(struct platform_device *pdev)
436436
{
437437
struct xgene_mdio_pdata *pdata = platform_get_drvdata(pdev);
438438
struct mii_bus *mdio_bus = pdata->mdio_bus;
@@ -443,8 +443,6 @@ static int xgene_mdio_remove(struct platform_device *pdev)
443443

444444
if (dev->of_node)
445445
clk_disable_unprepare(pdata->clk);
446-
447-
return 0;
448446
}
449447

450448
static struct platform_driver xgene_mdio_driver = {
@@ -454,7 +452,7 @@ static struct platform_driver xgene_mdio_driver = {
454452
.acpi_match_table = ACPI_PTR(xgene_mdio_acpi_match),
455453
},
456454
.probe = xgene_mdio_probe,
457-
.remove = xgene_mdio_remove,
455+
.remove_new = xgene_mdio_remove,
458456
};
459457

460458
module_platform_driver(xgene_mdio_driver);

0 commit comments

Comments
 (0)