Skip to content

Commit

Permalink
net: mdio: mux-bcm-iproc: Convert to platform remove callback returni…
Browse files Browse the repository at this point in the history
…ng 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>
  • Loading branch information
Uwe Kleine-König authored and David S. Miller committed Sep 20, 2023
1 parent fa2bc3c commit 8de522c
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/mdio/mdio-mux-bcm-iproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,13 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
return rc;
}

static int mdio_mux_iproc_remove(struct platform_device *pdev)
static void mdio_mux_iproc_remove(struct platform_device *pdev)
{
struct iproc_mdiomux_desc *md = platform_get_drvdata(pdev);

mdio_mux_uninit(md->mux_handle);
mdiobus_unregister(md->mii_bus);
clk_disable_unprepare(md->core_clk);

return 0;
}

#ifdef CONFIG_PM_SLEEP
Expand Down Expand Up @@ -342,7 +340,7 @@ static struct platform_driver mdiomux_iproc_driver = {
.pm = &mdio_mux_iproc_pm_ops,
},
.probe = mdio_mux_iproc_probe,
.remove = mdio_mux_iproc_remove,
.remove_new = mdio_mux_iproc_remove,
};

module_platform_driver(mdiomux_iproc_driver);
Expand Down

0 comments on commit 8de522c

Please sign in to comment.