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

net: ethernet: faraday: 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 4cc08098
...@@ -2012,7 +2012,7 @@ static int ftgmac100_probe(struct platform_device *pdev) ...@@ -2012,7 +2012,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
return err; return err;
} }
static int ftgmac100_remove(struct platform_device *pdev) static void ftgmac100_remove(struct platform_device *pdev)
{ {
struct net_device *netdev; struct net_device *netdev;
struct ftgmac100 *priv; struct ftgmac100 *priv;
...@@ -2040,7 +2040,6 @@ static int ftgmac100_remove(struct platform_device *pdev) ...@@ -2040,7 +2040,6 @@ static int ftgmac100_remove(struct platform_device *pdev)
netif_napi_del(&priv->napi); netif_napi_del(&priv->napi);
free_netdev(netdev); free_netdev(netdev);
return 0;
} }
static const struct of_device_id ftgmac100_of_match[] = { static const struct of_device_id ftgmac100_of_match[] = {
...@@ -2051,7 +2050,7 @@ MODULE_DEVICE_TABLE(of, ftgmac100_of_match); ...@@ -2051,7 +2050,7 @@ MODULE_DEVICE_TABLE(of, ftgmac100_of_match);
static struct platform_driver ftgmac100_driver = { static struct platform_driver ftgmac100_driver = {
.probe = ftgmac100_probe, .probe = ftgmac100_probe,
.remove = ftgmac100_remove, .remove_new = ftgmac100_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.of_match_table = ftgmac100_of_match, .of_match_table = ftgmac100_of_match,
......
...@@ -1219,7 +1219,7 @@ static int ftmac100_probe(struct platform_device *pdev) ...@@ -1219,7 +1219,7 @@ static int ftmac100_probe(struct platform_device *pdev)
return err; return err;
} }
static int ftmac100_remove(struct platform_device *pdev) static void ftmac100_remove(struct platform_device *pdev)
{ {
struct net_device *netdev; struct net_device *netdev;
struct ftmac100 *priv; struct ftmac100 *priv;
...@@ -1234,7 +1234,6 @@ static int ftmac100_remove(struct platform_device *pdev) ...@@ -1234,7 +1234,6 @@ static int ftmac100_remove(struct platform_device *pdev)
netif_napi_del(&priv->napi); netif_napi_del(&priv->napi);
free_netdev(netdev); free_netdev(netdev);
return 0;
} }
static const struct of_device_id ftmac100_of_ids[] = { static const struct of_device_id ftmac100_of_ids[] = {
...@@ -1244,7 +1243,7 @@ static const struct of_device_id ftmac100_of_ids[] = { ...@@ -1244,7 +1243,7 @@ static const struct of_device_id ftmac100_of_ids[] = {
static struct platform_driver ftmac100_driver = { static struct platform_driver ftmac100_driver = {
.probe = ftmac100_probe, .probe = ftmac100_probe,
.remove = ftmac100_remove, .remove_new = ftmac100_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.of_match_table = ftmac100_of_ids .of_match_table = ftmac100_of_ids
......
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