net: bcmgenet: remove old link state values

The PHY state machine has been fixed to only call the adjust_link
callback when the link state has changed. Therefore the old link
state variables are no longer needed to detect a change in link
state.

This commit effectively reverts
commit 5ad6e6c50899 ("net: bcmgenet: improve bcmgenet_mii_setup()")

Signed-off-by: Doug Berger <opendmb@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 23c7595d2a1d3f0f8ba89df4719cf098629a3767..3427f9ed7eb9bc3748e9911696296e8468f07f94 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3408,11 +3408,6 @@ static void bcmgenet_netif_stop(struct net_device *dev)
         */
        cancel_work_sync(&priv->bcmgenet_irq_work);
 
-       priv->old_link = -1;
-       priv->old_speed = -1;
-       priv->old_duplex = -1;
-       priv->old_pause = -1;
-
        /* tx reclaim */
        bcmgenet_tx_reclaim_all(dev);
        bcmgenet_fini_dma(priv);

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
index 0a6d91b0f0aa23790e7ac8e2152084b740fc3a70..406249bc9fe53c546487e69cdf82fa81d0a2775d 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
@@ -606,10 +606,6 @@ struct bcmgenet_priv {
        bool clk_eee_enabled;
 
        /* PHY device variables */
-       int old_link;
-       int old_speed;
-       int old_duplex;
-       int old_pause;
        phy_interface_t phy_interface;
        int phy_addr;
        int ext_phy;

diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 8a9d8ceaa5bf3f0eec36795652002d54108b6a8d..8fce5878a7d920a0e967f794ed579665d31c57c0 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -33,34 +33,8 @@ void bcmgenet_mii_setup(struct net_device *dev)
        struct bcmgenet_priv *priv = netdev_priv(dev);
        struct phy_device *phydev = dev->phydev;
        u32 reg, cmd_bits = 0;
-       bool status_changed = false;
-
-       if (priv->old_link != phydev->link) {
-               status_changed = true;
-               priv->old_link = phydev->link;
-       }
 
        if (phydev->link) {
-               /* check speed/duplex/pause changes */
-               if (priv->old_speed != phydev->speed) {
-                       status_changed = true;
-                       priv->old_speed = phydev->speed;
-               }
-
-               if (priv->old_duplex != phydev->duplex) {
-                       status_changed = true;
-                       priv->old_duplex = phydev->duplex;
-               }
-
-               if (priv->old_pause != phydev->pause) {
-                       status_changed = true;
-                       priv->old_pause = phydev->pause;
-               }
-
-               /* done if nothing has changed */
-               if (!status_changed)
-                       return;
-
                /* speed */
                if (phydev->speed == SPEED_1000)
                        cmd_bits = CMD_SPEED_1000;
@@ -102,10 +76,6 @@ void bcmgenet_mii_setup(struct net_device *dev)
                        reg |= CMD_TX_EN | CMD_RX_EN;
                }
                bcmgenet_umac_writel(priv, reg, UMAC_CMD);
-       } else {
-               /* done if nothing has changed */
-               if (!status_changed)
-                       return;
        }
 
        phy_print_status(phydev);
@@ -294,12 +264,6 @@ int bcmgenet_mii_probe(struct net_device *dev)
        if (priv->internal_phy)
                phy_flags = priv->gphy_rev;
 
-       /* Initialize link state variables that bcmgenet_mii_setup() uses */
-       priv->old_link = -1;
-       priv->old_speed = -1;
-       priv->old_duplex = -1;
-       priv->old_pause = -1;
-
        /* This is an ugly quirk but we have not been correctly interpreting
         * the phy_interface values and we have done that across different
         * drivers, so at least we are consistent in our mistakes.