net: phy: bcm7xxx: do not use PHY_BRCM_100MBPS_WAR
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 19 Sep 2014 20:07:51 +0000 (13:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Sep 2014 20:27:07 +0000 (16:27 -0400)
There is no need for the PHY driver to check PHY_BRCM_100MBPS_WAR since
that is redundant with checking the PHY device supported features. Get
rid of that workaround flag.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/bcm7xxx.c

index 09dd6e1..be3a591 100644 (file)
@@ -257,8 +257,8 @@ static int bcm7xxx_config_init(struct phy_device *phydev)
        phy_write(phydev, MII_BCM7XXX_AUX_MODE, MII_BCM7XX_64CLK_MDIO);
        phy_read(phydev, MII_BCM7XXX_AUX_MODE);
 
-       /* Workaround only required for 100Mbits/sec */
-       if (!(phydev->dev_flags & PHY_BRCM_100MBPS_WAR))
+       /* Workaround only required for 100Mbits/sec capable PHYs */
+       if (phydev->supported & PHY_GBIT_FEATURES)
                return 0;
 
        /* set shadow mode 2 */