3 files changed, 14 insertions, 37 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index ade108232048..0376a5e6b2bf 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -177,7 +177,7 @@ int stmmac_mdio_register(struct net_device *ndev)
         new_bus->write = &stmmac_mdio_write;
         new_bus->reset = &stmmac_mdio_reset;
         snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s-%x",
-                new_bus->name, mdio_bus_data->bus_id);
+                new_bus->name, priv->plat->bus_id);
         new_bus->priv = ndev;
         new_bus->irq = irqlist;
         new_bus->phy_mask = mdio_bus_data->phy_mask;
@@ -213,12 +213,10 @@ int stmmac_mdio_register(struct net_device *ndev)
                          * and no PHY number was provided to the MAC,
                          * use the one probed here.
                          */
-                        if ((priv->plat->bus_id == mdio_bus_data->bus_id) &&
-                            (priv->plat->phy_addr == -1))
+                        if (priv->plat->phy_addr == -1)
                                 priv->plat->phy_addr = addr;
 
-                        act = (priv->plat->bus_id == mdio_bus_data->bus_id) &&
-                                (priv->plat->phy_addr == addr);
+                        act = (priv->plat->phy_addr == addr);
                         switch (phydev->irq) {
                         case PHY_POLL:
                                 irq_str = "POLL";
@@ -258,6 +256,9 @@ int stmmac_mdio_unregister(struct net_device *ndev)
 {
         struct stmmac_priv *priv = netdev_priv(ndev);
 
+        if (!priv->mii)
+                return 0;
+
         mdiobus_unregister(priv->mii);
         priv->mii->priv = NULL;
         mdiobus_free(priv->mii);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 13afb8edfadc..1f069b0f6af5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -40,7 +40,6 @@ static void stmmac_default_data(void)
         plat_dat.has_gmac = 1;
         plat_dat.force_sf_dma_mode = 1;
 
-        mdio_data.bus_id = 1;
         mdio_data.phy_reset = NULL;
         mdio_data.phy_mask = 0;
         plat_dat.mdio_bus_data = &mdio_data;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index b93245c11995..ed112b55ae7f 100644
--- 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,7 +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);
-        struct resource *res;
         int ret = stmmac_dvr_remove(ndev);
 
         if (priv->plat->exit)
@@ -194,10 +175,6 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, NULL);
 
-        iounmap((void __force __iomem *)priv->ioaddr);
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, resource_size(res));
-
         return ret;
 }