stmmac: reorganise class operations.

[net-next-2.6.git] / drivers / net / stmmac / stmmac_mdio.c

diff --git a/drivers/net/stmmac/stmmac_mdio.c b/drivers/net/stmmac/stmmac_mdio.c
index 8498552a22fc20b9f99a0952b49bbd957fce5d09..131e0a60371141184d503c08fe58597419d5919c 100644 (file)
--- a/drivers/net/stmmac/stmmac_mdio.c
+++ b/drivers/net/stmmac/stmmac_mdio.c
@@ -48,8 +48,8 @@ static int stmmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg)
        struct net_device *ndev = bus->priv;
        struct stmmac_priv *priv = netdev_priv(ndev);
        unsigned long ioaddr = ndev->base_addr;
-       unsigned int mii_address = priv->mac_type->hw.mii.addr;
-       unsigned int mii_data = priv->mac_type->hw.mii.data;
+       unsigned int mii_address = priv->hw->mii.addr;
+       unsigned int mii_data = priv->hw->mii.data;
 
        int data;
        u16 regValue = (((phyaddr << 11) & (0x0000F800)) |
@@ -80,8 +80,8 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg,
        struct net_device *ndev = bus->priv;
        struct stmmac_priv *priv = netdev_priv(ndev);
        unsigned long ioaddr = ndev->base_addr;
-       unsigned int mii_address = priv->mac_type->hw.mii.addr;
-       unsigned int mii_data = priv->mac_type->hw.mii.data;
+       unsigned int mii_address = priv->hw->mii.addr;
+       unsigned int mii_data = priv->hw->mii.data;
 
        u16 value =
            (((phyaddr << 11) & (0x0000F800)) | ((phyreg << 6) & (0x000007C0)))
@@ -112,7 +112,7 @@ static int stmmac_mdio_reset(struct mii_bus *bus)
        struct net_device *ndev = bus->priv;
        struct stmmac_priv *priv = netdev_priv(ndev);
        unsigned long ioaddr = ndev->base_addr;
-       unsigned int mii_address = priv->mac_type->hw.mii.addr;
+       unsigned int mii_address = priv->hw->mii.addr;
 
        if (priv->phy_reset) {
                pr_debug("stmmac_mdio_reset: calling phy_reset\n");