Skip to content

Commit 67127f8

Browse files
lunnPaolo Abeni
authored andcommitted
net: ftgmac100: Use devm_request_memory_region/devm_ioremap
Make use of devm_ methods to request and remap the device memory 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-5-ad28a9067ea7@aspeedtech.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent f4bef83 commit 67127f8

1 file changed

Lines changed: 6 additions & 14 deletions

File tree

drivers/net/ethernet/faraday/ftgmac100.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,19 +1897,18 @@ static int ftgmac100_probe(struct platform_device *pdev)
18971897
INIT_WORK(&priv->reset_task, ftgmac100_reset_task);
18981898

18991899
/* map io memory */
1900-
priv->res = request_mem_region(res->start, resource_size(res),
1901-
dev_name(&pdev->dev));
1900+
priv->res = devm_request_mem_region(&pdev->dev,
1901+
res->start, resource_size(res),
1902+
dev_name(&pdev->dev));
19021903
if (!priv->res) {
19031904
dev_err(&pdev->dev, "Could not reserve memory region\n");
1904-
err = -ENOMEM;
1905-
goto err_req_mem;
1905+
return -ENOMEM;
19061906
}
19071907

1908-
priv->base = ioremap(res->start, resource_size(res));
1908+
priv->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
19091909
if (!priv->base) {
19101910
dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n");
1911-
err = -EIO;
1912-
goto err_ioremap;
1911+
return -EIO;
19131912
}
19141913

19151914
netdev->irq = irq;
@@ -2074,10 +2073,6 @@ static int ftgmac100_probe(struct platform_device *pdev)
20742073
ncsi_unregister_dev(priv->ndev);
20752074
ftgmac100_destroy_mdio(netdev);
20762075
err_setup_mdio:
2077-
iounmap(priv->base);
2078-
err_ioremap:
2079-
release_resource(priv->res);
2080-
err_req_mem:
20812076
return err;
20822077
}
20832078

@@ -2104,9 +2099,6 @@ static void ftgmac100_remove(struct platform_device *pdev)
21042099
ftgmac100_phy_disconnect(netdev);
21052100
ftgmac100_destroy_mdio(netdev);
21062101

2107-
iounmap(priv->base);
2108-
release_resource(priv->res);
2109-
21102102
netif_napi_del(&priv->napi);
21112103
}
21122104

0 commit comments

Comments
 (0)