summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/wiznet/w5100.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2023-09-18 22:42:24 +0200
committerDavid S. Miller <davem@davemloft.net>2023-09-20 09:06:41 +0100
commit46b5668494d0d1fb0c08546a81e5d0ab8e6084d5 (patch)
tree3b8b1ffeea2f24bea69a3fe13732edebae317962 /drivers/net/ethernet/wiznet/w5100.c
parent70680f17828048ddcf293de729970973cd3831ab (diff)
downloadlinux-stable-46b5668494d0d1fb0c08546a81e5d0ab8e6084d5.tar.gz
linux-stable-46b5668494d0d1fb0c08546a81e5d0ab8e6084d5.tar.bz2
linux-stable-46b5668494d0d1fb0c08546a81e5d0ab8e6084d5.zip
net: ethernet: wiznet: 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 these drivers 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>
Diffstat (limited to 'drivers/net/ethernet/wiznet/w5100.c')
-rw-r--r--drivers/net/ethernet/wiznet/w5100.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 634946e87e5f..341ee2f249fd 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -1062,11 +1062,9 @@ static int w5100_mmio_probe(struct platform_device *pdev)
mac_addr, irq, data ? data->link_gpio : -EINVAL);
}
-static int w5100_mmio_remove(struct platform_device *pdev)
+static void w5100_mmio_remove(struct platform_device *pdev)
{
w5100_remove(&pdev->dev);
-
- return 0;
}
void *w5100_ops_priv(const struct net_device *ndev)
@@ -1273,6 +1271,6 @@ static struct platform_driver w5100_mmio_driver = {
.pm = &w5100_pm_ops,
},
.probe = w5100_mmio_probe,
- .remove = w5100_mmio_remove,
+ .remove_new = w5100_mmio_remove,
};
module_platform_driver(w5100_mmio_driver);