net: stmmac: remove stmmac_lpi_entry_timer_config()

Remove stmmac_lpi_entry_timer_config(), setting priv->eee_sw_timer_en
at the original call sites, and calling the appropriate
stmmac_xxx_hw_lpi_timer() function. No functional change.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Choong Yong Liang <yong.liang.choong@linux.intel.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tVZEq-0002LQ-PC@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 69529e4bbb3a7268442833d4ee17364728483ca0..58b013528dea14b0eb39ad07f711596c26c7d9ca 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -400,16 +400,6 @@ static void stmmac_enable_hw_lpi_timer(struct stmmac_priv *priv)
        stmmac_set_eee_lpi_timer(priv, priv->hw, priv->tx_lpi_timer);
 }
 
-static void stmmac_lpi_entry_timer_config(struct stmmac_priv *priv, bool en)
-{
-       /* Clear/set the SW EEE timer flag based on LPI ET enablement */
-       priv->eee_sw_timer_en = en ? 0 : 1;
-       if (en)
-               stmmac_enable_hw_lpi_timer(priv);
-       else
-               stmmac_disable_hw_lpi_timer(priv);
-}
-
 /**
  * stmmac_enable_eee_mode - check and enter in LPI mode
  * @priv: driver private structure
@@ -489,7 +479,8 @@ static void stmmac_eee_init(struct stmmac_priv *priv, bool active)
        if (!priv->eee_active) {
                if (priv->eee_enabled) {
                        netdev_dbg(priv->dev, "disable EEE\n");
-                       stmmac_lpi_entry_timer_config(priv, 0);
+                       priv->eee_sw_timer_en = true;
+                       stmmac_disable_hw_lpi_timer(priv);
                        del_timer_sync(&priv->eee_ctrl_timer);
                        stmmac_set_eee_timer(priv, priv->hw, 0,
                                             STMMAC_DEFAULT_TWT_LS);
@@ -513,11 +504,15 @@ static void stmmac_eee_init(struct stmmac_priv *priv, bool active)
        }
 
        if (priv->plat->has_gmac4 && priv->tx_lpi_timer <= STMMAC_ET_MAX) {
+               /* Use hardware LPI mode */
                del_timer_sync(&priv->eee_ctrl_timer);
                priv->tx_path_in_lpi_mode = false;
-               stmmac_lpi_entry_timer_config(priv, 1);
+               priv->eee_sw_timer_en = false;
+               stmmac_enable_hw_lpi_timer(priv);
        } else {
-               stmmac_lpi_entry_timer_config(priv, 0);
+               /* Use software LPI mode */
+               priv->eee_sw_timer_en = true;
+               stmmac_disable_hw_lpi_timer(priv);
                mod_timer(&priv->eee_ctrl_timer,
                          STMMAC_LPI_T(priv->tx_lpi_timer));
        }