Commit 8ca0ae6a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by David S. Miller

net: ethernet: cirrus: 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de413f46
...@@ -1879,7 +1879,7 @@ static int __init cs89x0_platform_probe(struct platform_device *pdev) ...@@ -1879,7 +1879,7 @@ static int __init cs89x0_platform_probe(struct platform_device *pdev)
return err; return err;
} }
static int cs89x0_platform_remove(struct platform_device *pdev) static void cs89x0_platform_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
...@@ -1889,7 +1889,6 @@ static int cs89x0_platform_remove(struct platform_device *pdev) ...@@ -1889,7 +1889,6 @@ static int cs89x0_platform_remove(struct platform_device *pdev)
*/ */
unregister_netdev(dev); unregister_netdev(dev);
free_netdev(dev); free_netdev(dev);
return 0;
} }
static const struct of_device_id __maybe_unused cs89x0_match[] = { static const struct of_device_id __maybe_unused cs89x0_match[] = {
...@@ -1904,7 +1903,7 @@ static struct platform_driver cs89x0_driver = { ...@@ -1904,7 +1903,7 @@ static struct platform_driver cs89x0_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.of_match_table = of_match_ptr(cs89x0_match), .of_match_table = of_match_ptr(cs89x0_match),
}, },
.remove = cs89x0_platform_remove, .remove_new = cs89x0_platform_remove,
}; };
module_platform_driver_probe(cs89x0_driver, cs89x0_platform_probe); module_platform_driver_probe(cs89x0_driver, cs89x0_platform_probe);
......
...@@ -757,7 +757,7 @@ static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data) ...@@ -757,7 +757,7 @@ static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)
} }
static int ep93xx_eth_remove(struct platform_device *pdev) static void ep93xx_eth_remove(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct ep93xx_priv *ep; struct ep93xx_priv *ep;
...@@ -765,7 +765,7 @@ static int ep93xx_eth_remove(struct platform_device *pdev) ...@@ -765,7 +765,7 @@ static int ep93xx_eth_remove(struct platform_device *pdev)
dev = platform_get_drvdata(pdev); dev = platform_get_drvdata(pdev);
if (dev == NULL) if (dev == NULL)
return 0; return;
ep = netdev_priv(dev); ep = netdev_priv(dev);
...@@ -782,8 +782,6 @@ static int ep93xx_eth_remove(struct platform_device *pdev) ...@@ -782,8 +782,6 @@ static int ep93xx_eth_remove(struct platform_device *pdev)
} }
free_netdev(dev); free_netdev(dev);
return 0;
} }
static int ep93xx_eth_probe(struct platform_device *pdev) static int ep93xx_eth_probe(struct platform_device *pdev)
...@@ -862,7 +860,7 @@ static int ep93xx_eth_probe(struct platform_device *pdev) ...@@ -862,7 +860,7 @@ static int ep93xx_eth_probe(struct platform_device *pdev)
static struct platform_driver ep93xx_eth_driver = { static struct platform_driver ep93xx_eth_driver = {
.probe = ep93xx_eth_probe, .probe = ep93xx_eth_probe,
.remove = ep93xx_eth_remove, .remove_new = ep93xx_eth_remove,
.driver = { .driver = {
.name = "ep93xx-eth", .name = "ep93xx-eth",
}, },
......
...@@ -556,19 +556,18 @@ static int set_mac_address(struct net_device *dev, void *addr) ...@@ -556,19 +556,18 @@ static int set_mac_address(struct net_device *dev, void *addr)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int mac89x0_device_remove(struct platform_device *pdev) static void mac89x0_device_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
unregister_netdev(dev); unregister_netdev(dev);
nubus_writew(0, dev->base_addr + ADD_PORT); nubus_writew(0, dev->base_addr + ADD_PORT);
free_netdev(dev); free_netdev(dev);
return 0;
} }
static struct platform_driver mac89x0_platform_driver = { static struct platform_driver mac89x0_platform_driver = {
.probe = mac89x0_device_probe, .probe = mac89x0_device_probe,
.remove = mac89x0_device_remove, .remove_new = mac89x0_device_remove,
.driver = { .driver = {
.name = "mac89x0", .name = "mac89x0",
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment