aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2014-09-19 16:07:51 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-19 16:27:07 -0400
commite18556ee3bd83ed58f9fd77f66f05d17213a95f9 (patch)
treea4ab9db236fe140fd28a0b4cce731fa0f2c7e37c
parentbb7d93496f7ac203f7c3e9678000d1c83eb4e0ba (diff)
net: phy: bcm7xxx: do not use PHY_BRCM_100MBPS_WAR
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>
-rw-r--r--drivers/net/phy/bcm7xxx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
index 09dd6e1dc6e1..be3a591aabba 100644
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@ -257,8 +257,8 @@ static int bcm7xxx_config_init(struct phy_device *phydev)
257 phy_write(phydev, MII_BCM7XXX_AUX_MODE, MII_BCM7XX_64CLK_MDIO); 257 phy_write(phydev, MII_BCM7XXX_AUX_MODE, MII_BCM7XX_64CLK_MDIO);
258 phy_read(phydev, MII_BCM7XXX_AUX_MODE); 258 phy_read(phydev, MII_BCM7XXX_AUX_MODE);
259 259
260 /* Workaround only required for 100Mbits/sec */ 260 /* Workaround only required for 100Mbits/sec capable PHYs */
261 if (!(phydev->dev_flags & PHY_BRCM_100MBPS_WAR)) 261 if (phydev->supported & PHY_GBIT_FEATURES)
262 return 0; 262 return 0;
263 263
264 /* set shadow mode 2 */ 264 /* set shadow mode 2 */