From: Florian Fainelli Date: Fri, 19 Sep 2014 20:07:51 +0000 (-0700) Subject: net: phy: bcm7xxx: do not use PHY_BRCM_100MBPS_WAR X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e18556ee3bd83ed58f9fd77f66f05d17213a95f9;p=linux-beck.git 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 Signed-off-by: David S. Miller --- 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) 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 */