net: stmmac: remove unnecessary priv->eee_enabled tests

Phylink will not call the mac_disable_tx_lpi() and mac_enable_tx_lpi()
methods randomly - the first method to be called will be the enable
method, and then after, the disable method will be called once between
subsequent enable calls. Thus there is a guaranteed ordering.

Therefore, we know the previous state of priv->eee_enabled, and can
remove it from both methods.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tffdX-003ZI5-UV@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 517176533eb2de3692863ebba456f3946f367f9e..c57d800f0a853ce45340eecac99f67fe2b6cf74a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1046,18 +1046,17 @@ static void stmmac_mac_disable_tx_lpi(struct phylink_config *config)
 
        mutex_lock(&priv->lock);
 
-       /* Check if it needs to be deactivated */
-       if (priv->eee_enabled) {
-               netdev_dbg(priv->dev, "disable EEE\n");
-               priv->eee_sw_timer_en = false;
-               del_timer_sync(&priv->eee_ctrl_timer);
-               stmmac_reset_eee_mode(priv, priv->hw);
-               stmmac_set_eee_timer(priv, priv->hw, 0, STMMAC_DEFAULT_TWT_LS);
-               if (priv->hw->xpcs)
-                       xpcs_config_eee(priv->hw->xpcs,
-                                       priv->plat->mult_fact_100ns, false);
-       }
        priv->eee_enabled = false;
+
+       netdev_dbg(priv->dev, "disable EEE\n");
+       priv->eee_sw_timer_en = false;
+       del_timer_sync(&priv->eee_ctrl_timer);
+       stmmac_reset_eee_mode(priv, priv->hw);
+       stmmac_set_eee_timer(priv, priv->hw, 0, STMMAC_DEFAULT_TWT_LS);
+       if (priv->hw->xpcs)
+               xpcs_config_eee(priv->hw->xpcs, priv->plat->mult_fact_100ns,
+                               false);
+
        mutex_unlock(&priv->lock);
 }
 
@@ -1071,13 +1070,13 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
 
        mutex_lock(&priv->lock);
 
-       if (!priv->eee_enabled) {
-               stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS,
-                                    STMMAC_DEFAULT_TWT_LS);
-               if (priv->hw->xpcs)
-                       xpcs_config_eee(priv->hw->xpcs,
-                                       priv->plat->mult_fact_100ns, true);
-       }
+       priv->eee_enabled = true;
+
+       stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS,
+                            STMMAC_DEFAULT_TWT_LS);
+       if (priv->hw->xpcs)
+               xpcs_config_eee(priv->hw->xpcs, priv->plat->mult_fact_100ns,
+                               true);
 
        if (priv->plat->has_gmac4 && priv->tx_lpi_timer <= STMMAC_ET_MAX) {
                /* Use hardware LPI mode */
@@ -1092,8 +1091,6 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
                stmmac_restart_sw_lpi_timer(priv);
        }
 
-       priv->eee_enabled = true;
-
        mutex_unlock(&priv->lock);
        netdev_dbg(priv->dev, "Energy-Efficient Ethernet initialized\n");