net: stmmac: remove priv->eee_tw_timer

priv->eee_tw_timer is only assigned during initialisation to a
constant value (STMMAC_DEFAULT_TWT_LS) and then never changed.

Remove priv->eee_tw_timer, and instead use STMMAC_DEFAULT_TWT_LS
for both uses in stmmac_eee_init().

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/E1tVZEG-0002Kk-VH@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index d94fdecc8f3bc70c31048c9a2596f2c673ef4274..723ec0d161007b7240801d83dc2197cb092b422a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -308,7 +308,6 @@ struct stmmac_priv {
        int eee_enabled;
        int eee_active;
        u32 tx_lpi_timer;
-       int eee_tw_timer;
        bool eee_sw_timer_en;
        unsigned int mode;
        unsigned int chain_mode;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 5ea1470af3f3b38ec7df38799c79f50b383d1f71..cb1d03b530c470d0b66875856c193ef91214eca8 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -464,8 +464,6 @@ static void stmmac_eee_ctrl_timer(struct timer_list *t)
  */
 static bool stmmac_eee_init(struct stmmac_priv *priv)
 {
-       int eee_tw_timer = priv->eee_tw_timer;
-
        /* Check if MAC core supports the EEE feature. */
        if (!priv->dma_cap.eee)
                return false;
@@ -478,7 +476,8 @@ static bool stmmac_eee_init(struct stmmac_priv *priv)
                        netdev_dbg(priv->dev, "disable EEE\n");
                        stmmac_lpi_entry_timer_config(priv, 0);
                        del_timer_sync(&priv->eee_ctrl_timer);
-                       stmmac_set_eee_timer(priv, priv->hw, 0, eee_tw_timer);
+                       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,
@@ -491,7 +490,7 @@ static bool stmmac_eee_init(struct stmmac_priv *priv)
        if (priv->eee_active && !priv->eee_enabled) {
                timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0);
                stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS,
-                                    eee_tw_timer);
+                                    STMMAC_DEFAULT_TWT_LS);
                if (priv->hw->xpcs)
                        xpcs_config_eee(priv->hw->xpcs,
                                        priv->plat->mult_fact_100ns,
@@ -3454,8 +3453,6 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register)
        else if (ptp_register)
                stmmac_ptp_register(priv);
 
-       priv->eee_tw_timer = STMMAC_DEFAULT_TWT_LS;
-
        if (priv->use_riwt) {
                u32 queue;