net:stmmac: convert driver to use devm_request_and_ioremap.

This patch moves calls to ioremap and request_mem_region to
devm_request_and_ioremap call.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index b4ffdc7ba4fcf87d3cfa2b5348ffcb8fc9be1772..ed112b55ae7f95a587150a0f5ed23d58ca318f97 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -78,6 +78,7 @@ static int __devinit stmmac_pltfr_probe(struct platform_device *pdev)
 {
        int ret = 0;
        struct resource *res;
+       struct device *dev = &pdev->dev;
        void __iomem *addr = NULL;
        struct stmmac_priv *priv = NULL;
        struct plat_stmmacenet_data *plat_dat = NULL;
@@ -87,18 +88,10 @@ static int __devinit stmmac_pltfr_probe(struct platform_device *pdev)
        if (!res)
                return -ENODEV;
 
-       if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
-               pr_err("%s: ERROR: memory allocation failed"
-                      "cannot get the I/O addr 0x%x\n",
-                      __func__, (unsigned int)res->start);
-               return -EBUSY;
-       }
-
-       addr = ioremap(res->start, resource_size(res));
+       addr = devm_request_and_ioremap(dev, res);
        if (!addr) {
                pr_err("%s: ERROR: memory mapping failed", __func__);
-               ret = -ENOMEM;
-               goto out_release_region;
+               return -ENOMEM;
        }
 
        if (pdev->dev.of_node) {
@@ -107,14 +100,13 @@ static int __devinit stmmac_pltfr_probe(struct platform_device *pdev)
                                        GFP_KERNEL);
                if (!plat_dat) {
                        pr_err("%s: ERROR: no memory", __func__);
-                       ret = -ENOMEM;
-                       goto out_unmap;
+                       return  -ENOMEM;
                }
 
                ret = stmmac_probe_config_dt(pdev, plat_dat, &mac);
                if (ret) {
                        pr_err("%s: main dt probe failed", __func__);
-                       goto out_unmap;
+                       return ret;
                }
        } else {
                plat_dat = pdev->dev.platform_data;
@@ -124,13 +116,13 @@ static int __devinit stmmac_pltfr_probe(struct platform_device *pdev)
        if (plat_dat->init) {
                ret = plat_dat->init(pdev);
                if (unlikely(ret))
-                       goto out_unmap;
+                       return ret;
        }
 
        priv = stmmac_dvr_probe(&(pdev->dev), plat_dat, addr);
        if (!priv) {
                pr_err("%s: main driver probe failed", __func__);
-               goto out_unmap;
+               return -ENODEV;
        }
 
        /* Get MAC address if available (DT) */
@@ -142,8 +134,7 @@ static int __devinit stmmac_pltfr_probe(struct platform_device *pdev)
        if (priv->dev->irq == -ENXIO) {
                pr_err("%s: ERROR: MAC IRQ configuration "
                       "information not found\n", __func__);
-               ret = -ENXIO;
-               goto out_unmap;
+               return -ENXIO;
        }
 
        /*
@@ -165,15 +156,6 @@ static int __devinit stmmac_pltfr_probe(struct platform_device *pdev)
        pr_debug("STMMAC platform driver registration completed");
 
        return 0;
-
-out_unmap:
-       iounmap(addr);
-       platform_set_drvdata(pdev, NULL);
-
-out_release_region:
-       release_mem_region(res->start, resource_size(res));
-
-       return ret;
 }
 
 /**
@@ -186,8 +168,6 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)
 {
        struct net_device *ndev = platform_get_drvdata(pdev);
        struct stmmac_priv *priv = netdev_priv(ndev);
-       void __iomem *addr = priv->ioaddr;
-       struct resource *res;
        int ret = stmmac_dvr_remove(ndev);
 
        if (priv->plat->exit)
@@ -195,10 +175,6 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, NULL);
 
-       iounmap(addr);
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(res->start, resource_size(res));
-
        return ret;
 }