| Message ID | E1tVZDw-0002KL-Gg@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: stmmac: clean up and fix EEE implementation | expand |
On Wed, Jan 08, 2025 at 04:48:04PM +0000, Russell King (Oracle) wrote: > stmmac_disable_eee_mode() is now only called from stmmac_xmit() when > both priv->tx_path_in_lpi_mode and priv->eee_sw_timer_en are true. > Therefore: > > if (!priv->eee_sw_timer_en) > > in stmmac_disable_eee_mode() will never be true, so this is dead code. > Remove it, and rename the function to indicate that it now only deals > with software based EEE mode. > > 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> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index de06aa1ff3f6..9a043d19ebac 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -427,18 +427,13 @@ static int stmmac_enable_eee_mode(struct stmmac_priv *priv) > } > > /** > - * stmmac_disable_eee_mode - disable and exit from LPI mode > + * stmmac_disable_sw_eee_mode - disable and exit from LPI mode > * @priv: driver private structure > * Description: this function is to exit and disable EEE in case of > * LPI state is true. This is called by the xmit. > */ > -static void stmmac_disable_eee_mode(struct stmmac_priv *priv) > +static void stmmac_disable_sw_eee_mode(struct stmmac_priv *priv) Looking at this again, I'm still not happy with the function name, but not enough to send another version. I'll change it to stmmac_stop_sw_lpi() in the next batch of stmmac EEE cleanups (there is more to come!)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index de06aa1ff3f6..9a043d19ebac 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -427,18 +427,13 @@ static int stmmac_enable_eee_mode(struct stmmac_priv *priv) } /** - * stmmac_disable_eee_mode - disable and exit from LPI mode + * stmmac_disable_sw_eee_mode - disable and exit from LPI mode * @priv: driver private structure * Description: this function is to exit and disable EEE in case of * LPI state is true. This is called by the xmit. */ -static void stmmac_disable_eee_mode(struct stmmac_priv *priv) +static void stmmac_disable_sw_eee_mode(struct stmmac_priv *priv) { - if (!priv->eee_sw_timer_en) { - stmmac_lpi_entry_timer_config(priv, 0); - return; - } - stmmac_reset_eee_mode(priv, priv->hw); del_timer_sync(&priv->eee_ctrl_timer); priv->tx_path_in_lpi_mode = false; @@ -4495,7 +4490,7 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) first_tx = tx_q->cur_tx; if (priv->tx_path_in_lpi_mode && priv->eee_sw_timer_en) - stmmac_disable_eee_mode(priv); + stmmac_disable_sw_eee_mode(priv); /* Manage oversized TCP frames for GMAC4 device */ if (skb_is_gso(skb) && priv->tso) {