net: ethernet-rgmii.c: Fix breakage from moving phdev bus
authorAndrew Lunn <andrew@lunn.ch>
Thu, 7 Jan 2016 20:55:52 +0000 (21:55 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 10 Jan 2016 23:03:47 +0000 (18:03 -0500)
The mdio device patches moved the bus member in phy_device into a
substructure. This driver got missed. Fix it.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/staging/octeon/ethernet-rgmii.c

index 613344b886e1687dff3bd2ba4ebe6a1ca32eae5e..1055ee14b66a7834883552e0f6a5dc229778784c 100644 (file)
@@ -78,7 +78,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev)
                 */
                spin_lock_irqsave(&global_register_lock, flags);
        } else {
-               mutex_lock(&priv->phydev->bus->mdio_lock);
+               mutex_lock(&priv->phydev->mdio.bus->mdio_lock);
        }
 
        link_info = cvmx_helper_link_get(priv->port);
@@ -113,7 +113,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev)
                if (use_global_register_lock)
                        spin_unlock_irqrestore(&global_register_lock, flags);
                else
-                       mutex_unlock(&priv->phydev->bus->mdio_lock);
+                       mutex_unlock(&priv->phydev->mdio.bus->mdio_lock);
                return;
        }
 
@@ -132,7 +132,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev)
        if (use_global_register_lock)
                spin_unlock_irqrestore(&global_register_lock, flags);
        else
-               mutex_unlock(&priv->phydev->bus->mdio_lock);
+               mutex_unlock(&priv->phydev->mdio.bus->mdio_lock);
 
        if (priv->phydev == NULL) {
                /* Tell core. */