net:stmmac: Remove bus_id from mdio platform data.

This patch removes bus_id from mdio platform data, The reason to remove
bus_id is, stmmac mdio bus_id is always same as stmmac bus-id, so there
is no point in passing this in different variable.
Also stmmac ethernet driver connects to phy with bus_id passed its
platform data.
So, having single bus-id is much simpler.

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

2 files changed, 3 insertions, 6 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index e1f3d04a8c90..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";
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;