Skip to content

Commit

Permalink
net: ethernet: xscale: Convert to platform remove callback returning …
Browse files Browse the repository at this point in the history
…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>
Acked-by: Krzysztof Hałasa <khalasa@piap.pl>
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 2e0ec0a commit d74a5c1
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/net/ethernet/xscale/ixp4xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -1533,7 +1533,7 @@ static int ixp4xx_eth_probe(struct platform_device *pdev)
return err;
}

static int ixp4xx_eth_remove(struct platform_device *pdev)
static void ixp4xx_eth_remove(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
struct phy_device *phydev = ndev->phydev;
Expand All @@ -1544,7 +1544,6 @@ static int ixp4xx_eth_remove(struct platform_device *pdev)
ixp4xx_mdio_remove();
npe_port_tab[NPE_ID(port->id)] = NULL;
npe_release(port->npe);
return 0;
}

static const struct of_device_id ixp4xx_eth_of_match[] = {
Expand All @@ -1560,7 +1559,7 @@ static struct platform_driver ixp4xx_eth_driver = {
.of_match_table = of_match_ptr(ixp4xx_eth_of_match),
},
.probe = ixp4xx_eth_probe,
.remove = ixp4xx_eth_remove,
.remove_new = ixp4xx_eth_remove,
};
module_platform_driver(ixp4xx_eth_driver);

Expand Down

0 comments on commit d74a5c1

Please sign in to comment.