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

net: ethernet: sgi: 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 02c74030
...@@ -962,7 +962,7 @@ static int ioc3eth_probe(struct platform_device *pdev) ...@@ -962,7 +962,7 @@ static int ioc3eth_probe(struct platform_device *pdev)
return err; return err;
} }
static int ioc3eth_remove(struct platform_device *pdev) static void ioc3eth_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct ioc3_private *ip = netdev_priv(dev); struct ioc3_private *ip = netdev_priv(dev);
...@@ -973,8 +973,6 @@ static int ioc3eth_remove(struct platform_device *pdev) ...@@ -973,8 +973,6 @@ static int ioc3eth_remove(struct platform_device *pdev)
unregister_netdev(dev); unregister_netdev(dev);
del_timer_sync(&ip->ioc3_timer); del_timer_sync(&ip->ioc3_timer);
free_netdev(dev); free_netdev(dev);
return 0;
} }
...@@ -1275,7 +1273,7 @@ static void ioc3_set_multicast_list(struct net_device *dev) ...@@ -1275,7 +1273,7 @@ static void ioc3_set_multicast_list(struct net_device *dev)
static struct platform_driver ioc3eth_driver = { static struct platform_driver ioc3eth_driver = {
.probe = ioc3eth_probe, .probe = ioc3eth_probe,
.remove = ioc3eth_remove, .remove_new = ioc3eth_remove,
.driver = { .driver = {
.name = "ioc3-eth", .name = "ioc3-eth",
} }
......
...@@ -854,19 +854,17 @@ static int meth_probe(struct platform_device *pdev) ...@@ -854,19 +854,17 @@ static int meth_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int meth_remove(struct platform_device *pdev) static void meth_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);
free_netdev(dev); free_netdev(dev);
return 0;
} }
static struct platform_driver meth_driver = { static struct platform_driver meth_driver = {
.probe = meth_probe, .probe = meth_probe,
.remove = meth_remove, .remove_new = meth_remove,
.driver = { .driver = {
.name = "meth", .name = "meth",
} }
......
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