aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2025-02-05 13:40:26 +0000
committerJakub Kicinski <kuba@kernel.org>2025-02-07 11:56:09 -0800
commit9b6649a810752bf2fc2c33d58efc97c48d1a1644 (patch)
treea4bb9c0dbe9881068a08097da96c2e15c7be70d0
parentnet: stmmac: clear priv->tx_path_in_lpi_mode when disabling LPI (diff)
downloadwireguard-linux-9b6649a810752bf2fc2c33d58efc97c48d1a1644.tar.xz
wireguard-linux-9b6649a810752bf2fc2c33d58efc97c48d1a1644.zip
net: stmmac: remove unnecessary LPI disable when enabling LPI
Remove the unnecessary LPI disable when enabling LPI - as noted in previous commits, there will never be two consecutive calls to stmmac_mac_enable_tx_lpi() without an intervening stmmac_mac_disable_tx_lpi. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://patch.msgid.link/E1tffdi-003ZIH-5h@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index bf549ab78f78..5890a21d1ef9 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -390,11 +390,6 @@ static inline u32 stmmac_rx_dirty(struct stmmac_priv *priv, u32 queue)
return dirty;
}
-static void stmmac_disable_hw_lpi_timer(struct stmmac_priv *priv)
-{
- stmmac_set_eee_lpi_timer(priv, priv->hw, 0);
-}
-
static void stmmac_enable_hw_lpi_timer(struct stmmac_priv *priv)
{
stmmac_set_eee_lpi_timer(priv, priv->hw, priv->tx_lpi_timer);
@@ -1082,14 +1077,10 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
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;
- priv->eee_sw_timer_en = false;
stmmac_enable_hw_lpi_timer(priv);
} else {
/* Use software LPI mode */
priv->eee_sw_timer_en = true;
- stmmac_disable_hw_lpi_timer(priv);
stmmac_restart_sw_lpi_timer(priv);
}