From: Andrew Lunn <andrew@lunn.ch>
Make use of devm_alloc_etherdev() to simplify cleanup.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jacky Chou <jacky_chou@aspeedtech.com>
---
drivers/net/ethernet/faraday/ftgmac100.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index f07167cabf39..75c7ab43e7e9 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1877,10 +1877,9 @@ static int ftgmac100_probe(struct platform_device *pdev)
return irq;
/* setup net_device */
- netdev = alloc_etherdev(sizeof(*priv));
+ netdev = devm_alloc_etherdev(&pdev->dev, sizeof(*priv));
if (!netdev) {
- err = -ENOMEM;
- goto err_alloc_etherdev;
+ return -ENOMEM;
}
SET_NETDEV_DEV(netdev, &pdev->dev);
@@ -2080,8 +2079,6 @@ static int ftgmac100_probe(struct platform_device *pdev)
err_ioremap:
release_resource(priv->res);
err_req_mem:
- free_netdev(netdev);
-err_alloc_etherdev:
return err;
}
@@ -2112,7 +2109,6 @@ static void ftgmac100_remove(struct platform_device *pdev)
release_resource(priv->res);
netif_napi_del(&priv->napi);
- free_netdev(netdev);
}
static const struct ftgmac100_match_data ftgmac100_match_data_ast2400 = {
--
2.34.1