net: stmmac: remove unnecessary priv->eee_active tests

Since priv->eee_active is assigned with a constant value in each of
these methods, there is no need to test its value later. Remove these
unnecessary tests.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tffdS-003ZHz-Qi@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 d3854e1b4d269fa43b554daf8bf5adeec93e5a4e..517176533eb2de3692863ebba456f3946f367f9e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1047,21 +1047,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_active) {
-               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;
+       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;
        mutex_unlock(&priv->lock);
 }
 
@@ -1075,13 +1071,12 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
 
        mutex_lock(&priv->lock);
 
-       if (priv->eee_active && !priv->eee_enabled) {
+       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->plat->mult_fact_100ns, true);
        }
 
        if (priv->plat->has_gmac4 && priv->tx_lpi_timer <= STMMAC_ET_MAX) {