Skip to content

Commit 8de522c

Browse files
Uwe Kleine-Königdavem330
authored andcommitted
net: mdio: mux-bcm-iproc: 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> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent fa2bc3c commit 8de522c

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/net/mdio/mdio-mux-bcm-iproc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,13 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
287287
return rc;
288288
}
289289

290-
static int mdio_mux_iproc_remove(struct platform_device *pdev)
290+
static void mdio_mux_iproc_remove(struct platform_device *pdev)
291291
{
292292
struct iproc_mdiomux_desc *md = platform_get_drvdata(pdev);
293293

294294
mdio_mux_uninit(md->mux_handle);
295295
mdiobus_unregister(md->mii_bus);
296296
clk_disable_unprepare(md->core_clk);
297-
298-
return 0;
299297
}
300298

301299
#ifdef CONFIG_PM_SLEEP
@@ -342,7 +340,7 @@ static struct platform_driver mdiomux_iproc_driver = {
342340
.pm = &mdio_mux_iproc_pm_ops,
343341
},
344342
.probe = mdio_mux_iproc_probe,
345-
.remove = mdio_mux_iproc_remove,
343+
.remove_new = mdio_mux_iproc_remove,
346344
};
347345

348346
module_platform_driver(mdiomux_iproc_driver);

0 commit comments

Comments
 (0)