Commit 9b6649a8 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tffdi-003ZIH-5h@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 54f85e52

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+0 −9
Original line number Diff line number Diff line
@@ -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);

	}