Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[deliverable/linux.git] / drivers / net / ethernet / arc / emac_main.c

diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c
index 248baf6273fb76a2b179c50fe068aeddff51a42e..eeecc29cf5b7d2695739d819fe900e798bf38996 100644 (file)
--- a/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@ -381,17 +381,7 @@ static int arc_emac_open(struct net_device *ndev)
        phy_dev->autoneg = AUTONEG_ENABLE;
        phy_dev->speed = 0;
        phy_dev->duplex = 0;
-       phy_dev->advertising = phy_dev->supported;
-
-       if (priv->max_speed > 100) {
-               phy_dev->advertising &= PHY_GBIT_FEATURES;
-       } else if (priv->max_speed <= 100) {
-               phy_dev->advertising &= PHY_BASIC_FEATURES;
-               if (priv->max_speed <= 10) {
-                       phy_dev->advertising &= ~SUPPORTED_100baseT_Half;
-                       phy_dev->advertising &= ~SUPPORTED_100baseT_Full;
-               }
-       }
+       phy_dev->advertising &= phy_dev->supported;
 
        priv->last_rx_bd = 0;
 
@@ -704,14 +694,6 @@ static int arc_emac_probe(struct platform_device *pdev)
        /* Set poll rate so that it polls every 1 ms */
        arc_reg_set(priv, R_POLLRATE, clock_frequency / 1000000);
 
-       /* Get max speed of operation from device tree */
-       if (of_property_read_u32(pdev->dev.of_node, "max-speed",
-                                &priv->max_speed)) {
-               dev_err(&pdev->dev, "failed to retrieve <max-speed> from device tree\n");
-               err = -EINVAL;
-               goto out;
-       }
-
        ndev->irq = irq;
        dev_info(&pdev->dev, "IRQ is %d\n", ndev->irq);