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>

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 397ada43c85145124a2ae36af776a1cb7840972f..ec2e7ec23ddf557ee350f3fb30ab07e19d8fffce 100644 (file)
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1897,19 +1897,18 @@ static int ftgmac100_probe(struct platform_device *pdev)
        INIT_WORK(&priv->reset_task, ftgmac100_reset_task);
 
        /* map io memory */
-       priv->res = request_mem_region(res->start, resource_size(res),
-                                      dev_name(&pdev->dev));
+       priv->res = devm_request_mem_region(&pdev->dev,
+                                           res->start, resource_size(res),
+                                           dev_name(&pdev->dev));
        if (!priv->res) {
                dev_err(&pdev->dev, "Could not reserve memory region\n");
-               err = -ENOMEM;
-               goto err_req_mem;
+               return -ENOMEM;
        }
 
-       priv->base = ioremap(res->start, resource_size(res));
+       priv->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
        if (!priv->base) {
                dev_err(&pdev->dev, "Failed to ioremap ethernet registers\n");
-               err = -EIO;
-               goto err_ioremap;
+               return -EIO;
        }
 
        netdev->irq = irq;
@@ -2074,10 +2073,6 @@ err_ncsi_dev:
                ncsi_unregister_dev(priv->ndev);
        ftgmac100_destroy_mdio(netdev);
 err_setup_mdio:
-       iounmap(priv->base);
-err_ioremap:
-       release_resource(priv->res);
-err_req_mem:
        return err;
 }
 
@@ -2104,9 +2099,6 @@ static void ftgmac100_remove(struct platform_device *pdev)
        ftgmac100_phy_disconnect(netdev);
        ftgmac100_destroy_mdio(netdev);
 
-       iounmap(priv->base);
-       release_resource(priv->res);
-
        netif_napi_del(&priv->napi);
 }