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

net: ethernet: actions: 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 this 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 3c000faa
...@@ -1582,15 +1582,13 @@ static int owl_emac_probe(struct platform_device *pdev) ...@@ -1582,15 +1582,13 @@ static int owl_emac_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int owl_emac_remove(struct platform_device *pdev) static void owl_emac_remove(struct platform_device *pdev)
{ {
struct owl_emac_priv *priv = platform_get_drvdata(pdev); struct owl_emac_priv *priv = platform_get_drvdata(pdev);
netif_napi_del(&priv->napi); netif_napi_del(&priv->napi);
phy_disconnect(priv->netdev->phydev); phy_disconnect(priv->netdev->phydev);
cancel_work_sync(&priv->mac_reset_task); cancel_work_sync(&priv->mac_reset_task);
return 0;
} }
static const struct of_device_id owl_emac_of_match[] = { static const struct of_device_id owl_emac_of_match[] = {
...@@ -1609,7 +1607,7 @@ static struct platform_driver owl_emac_driver = { ...@@ -1609,7 +1607,7 @@ static struct platform_driver owl_emac_driver = {
.pm = &owl_emac_pm_ops, .pm = &owl_emac_pm_ops,
}, },
.probe = owl_emac_probe, .probe = owl_emac_probe,
.remove = owl_emac_remove, .remove_new = owl_emac_remove,
}; };
module_platform_driver(owl_emac_driver); module_platform_driver(owl_emac_driver);
......
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