Skip to content

Commit f4bef83

Browse files
lunnPaolo Abeni
authored andcommitted
net: ftgmac100: Use devm_alloc_etherdev()
Make use of devm_alloc_etherdev() to simplify cleanup. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: Jacky Chou <jacky_chou@aspeedtech.com> Link: https://patch.msgid.link/20260206-ftgmac-cleanup-v5-4-ad28a9067ea7@aspeedtech.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 9b42f74 commit f4bef83

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

drivers/net/ethernet/faraday/ftgmac100.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1877,11 +1877,9 @@ static int ftgmac100_probe(struct platform_device *pdev)
18771877
return irq;
18781878

18791879
/* setup net_device */
1880-
netdev = alloc_etherdev(sizeof(*priv));
1881-
if (!netdev) {
1882-
err = -ENOMEM;
1883-
goto err_alloc_etherdev;
1884-
}
1880+
netdev = devm_alloc_etherdev(&pdev->dev, sizeof(*priv));
1881+
if (!netdev)
1882+
return -ENOMEM;
18851883

18861884
SET_NETDEV_DEV(netdev, &pdev->dev);
18871885

@@ -2080,8 +2078,6 @@ static int ftgmac100_probe(struct platform_device *pdev)
20802078
err_ioremap:
20812079
release_resource(priv->res);
20822080
err_req_mem:
2083-
free_netdev(netdev);
2084-
err_alloc_etherdev:
20852081
return err;
20862082
}
20872083

@@ -2112,7 +2108,6 @@ static void ftgmac100_remove(struct platform_device *pdev)
21122108
release_resource(priv->res);
21132109

21142110
netif_napi_del(&priv->napi);
2115-
free_netdev(netdev);
21162111
}
21172112

21182113
static const struct ftgmac100_match_data ftgmac100_match_data_ast2400 = {

0 commit comments

Comments
 (0)