diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2014-09-19 13:07:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-19 16:27:07 -0400 |
| commit | 80780a54ecded1647e661ababde13554a149f7f3 (patch) | |
| tree | 4b1d11b7b208ee77cb8c0c4a85f17b2b5d483962 /drivers/net/ethernet/broadcom | |
| parent | e18556ee3bd83ed58f9fd77f66f05d17213a95f9 (diff) | |
| download | op-kernel-dev-80780a54ecded1647e661ababde13554a149f7f3.zip op-kernel-dev-80780a54ecded1647e661ababde13554a149f7f3.tar.gz | |
net: bcmgenet: remove PHY_BRCM_100MBPS_WAR
Now that we have removed the need for the PHY_BRCM_100MBPS_WAR flag, we
can remove it from the GENET driver and the broadcom shared header file.
The PHY driver checks the PHY supported bitmask instead.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmmii.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index c88f7ae..71f2ef7 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -296,7 +296,6 @@ static int bcmgenet_mii_probe(struct net_device *dev) struct bcmgenet_priv *priv = netdev_priv(dev); struct device_node *dn = priv->pdev->dev.of_node; struct phy_device *phydev; - unsigned int phy_flags; int ret; if (priv->phydev) { @@ -338,15 +337,6 @@ static int bcmgenet_mii_probe(struct net_device *dev) return ret; } - phy_flags = PHY_BRCM_100MBPS_WAR; - - /* workarounds are only needed for 100Mpbs PHYs, and - * never on GENET V1 hardware - */ - if ((phydev->supported & PHY_GBIT_FEATURES) || GENET_IS_V1(priv)) - phy_flags = 0; - - phydev->dev_flags |= phy_flags; phydev->advertising = phydev->supported; /* The internal PHY has its link interrupts routed to the |
