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

net: ethernet: apm: 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 driver 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 9ecae52f
...@@ -690,7 +690,7 @@ static int xge_probe(struct platform_device *pdev) ...@@ -690,7 +690,7 @@ static int xge_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int xge_remove(struct platform_device *pdev) static void xge_remove(struct platform_device *pdev)
{ {
struct xge_pdata *pdata; struct xge_pdata *pdata;
struct net_device *ndev; struct net_device *ndev;
...@@ -706,8 +706,6 @@ static int xge_remove(struct platform_device *pdev) ...@@ -706,8 +706,6 @@ static int xge_remove(struct platform_device *pdev)
xge_mdio_remove(ndev); xge_mdio_remove(ndev);
unregister_netdev(ndev); unregister_netdev(ndev);
free_netdev(ndev); free_netdev(ndev);
return 0;
} }
static void xge_shutdown(struct platform_device *pdev) static void xge_shutdown(struct platform_device *pdev)
...@@ -736,7 +734,7 @@ static struct platform_driver xge_driver = { ...@@ -736,7 +734,7 @@ static struct platform_driver xge_driver = {
.acpi_match_table = ACPI_PTR(xge_acpi_match), .acpi_match_table = ACPI_PTR(xge_acpi_match),
}, },
.probe = xge_probe, .probe = xge_probe,
.remove = xge_remove, .remove_new = xge_remove,
.shutdown = xge_shutdown, .shutdown = xge_shutdown,
}; };
module_platform_driver(xge_driver); module_platform_driver(xge_driver);
......
...@@ -2127,7 +2127,7 @@ static int xgene_enet_probe(struct platform_device *pdev) ...@@ -2127,7 +2127,7 @@ static int xgene_enet_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int xgene_enet_remove(struct platform_device *pdev) static void xgene_enet_remove(struct platform_device *pdev)
{ {
struct xgene_enet_pdata *pdata; struct xgene_enet_pdata *pdata;
struct net_device *ndev; struct net_device *ndev;
...@@ -2149,8 +2149,6 @@ static int xgene_enet_remove(struct platform_device *pdev) ...@@ -2149,8 +2149,6 @@ static int xgene_enet_remove(struct platform_device *pdev)
xgene_enet_delete_desc_rings(pdata); xgene_enet_delete_desc_rings(pdata);
pdata->port_ops->shutdown(pdata); pdata->port_ops->shutdown(pdata);
free_netdev(ndev); free_netdev(ndev);
return 0;
} }
static void xgene_enet_shutdown(struct platform_device *pdev) static void xgene_enet_shutdown(struct platform_device *pdev)
...@@ -2174,7 +2172,7 @@ static struct platform_driver xgene_enet_driver = { ...@@ -2174,7 +2172,7 @@ static struct platform_driver xgene_enet_driver = {
.acpi_match_table = ACPI_PTR(xgene_enet_acpi_match), .acpi_match_table = ACPI_PTR(xgene_enet_acpi_match),
}, },
.probe = xgene_enet_probe, .probe = xgene_enet_probe,
.remove = xgene_enet_remove, .remove_new = xgene_enet_remove,
.shutdown = xgene_enet_shutdown, .shutdown = xgene_enet_shutdown,
}; };
......
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