From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Jose Abreu <joabreu@synopsys.com>,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
netdev@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net-next v4 16/18] net: stmmac: remove unnecessary EEE handling in stmmac_release()
Date: Wed, 08 Jan 2025 16:48:50 +0000 [thread overview]
Message-ID: <E1tVZEg-0002LE-HH@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <Z36sHIlnExQBuFJE@shell.armlinux.org.uk>
phylink_stop() will cause phylink to call the mac_link_down() operation
before phylink_stop() returns. As mac_link_down() will call
stmmac_eee_init(false), this will set both priv->eee_active and
priv->eee_enabled to be false, deleting the eee_ctrl_timer if
priv->eee_enabled was previously set.
As stmmac_release() calls phylink_stop() before checking whether
priv->eee_enabled is true, this is a condition that can never be
satisfied, and thus the code within this if() block will never be
executed. Remove it.
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 | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 57338794695c..6d01dcafaf15 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4033,11 +4033,6 @@ static int stmmac_release(struct net_device *dev)
/* Free the IRQ lines */
stmmac_free_irq(dev, REQ_IRQ_ERR_ALL, 0);
- if (priv->eee_enabled) {
- priv->tx_path_in_lpi_mode = false;
- del_timer_sync(&priv->eee_ctrl_timer);
- }
-
/* Stop TX/RX DMA and clear the descriptors */
stmmac_stop_all_dma(priv);
--
2.30.2
next prev parent reply other threads:[~2025-01-08 16:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-08 16:47 [PATCH net-next v4 00/18] net: stmmac: clean up and fix EEE implementation Russell King (Oracle)
2025-01-08 16:47 ` [PATCH net-next v4 01/18] net: phy: add configuration of rx clock stop mode Russell King (Oracle)
2025-01-08 16:47 ` [PATCH net-next v4 02/18] net: stmmac: move tx_lpi_timer tracking to phylib Russell King (Oracle)
2025-01-08 16:47 ` [PATCH net-next v4 03/18] net: stmmac: use correct type for tx_lpi_timer Russell King (Oracle)
2025-01-08 16:47 ` [PATCH net-next v4 04/18] net: stmmac: use unsigned int for eee_timer Russell King (Oracle)
2025-01-08 16:47 ` [PATCH net-next v4 05/18] net: stmmac: make EEE depend on phy->enable_tx_lpi Russell King (Oracle)
2025-01-08 16:47 ` [PATCH net-next v4 06/18] net: stmmac: remove redundant code from ethtool EEE ops Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 07/18] net: stmmac: clean up stmmac_disable_eee_mode() Russell King (Oracle)
2025-01-08 20:25 ` Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 08/18] net: stmmac: remove priv->tx_lpi_enabled Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 09/18] net: stmmac: report EEE error statistics if EEE is supported Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 10/18] net: stmmac: convert to use phy_eee_rx_clock_stop() Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 11/18] net: stmmac: remove priv->eee_tw_timer Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 12/18] net: stmmac: move priv->eee_enabled into stmmac_eee_init() Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 13/18] net: stmmac: move priv->eee_active " Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 14/18] net: stmmac: use boolean for eee_enabled and eee_active Russell King (Oracle)
2025-01-08 16:48 ` [PATCH net-next v4 15/18] net: stmmac: move setup of eee_ctrl_timer to stmmac_dvr_probe() Russell King (Oracle)
2025-01-08 16:48 ` Russell King (Oracle) [this message]
2025-01-08 16:48 ` [PATCH net-next v4 17/18] net: stmmac: split hardware LPI timer control Russell King (Oracle)
2025-01-08 16:49 ` [PATCH net-next v4 18/18] net: stmmac: remove stmmac_lpi_entry_timer_config() Russell King (Oracle)
2025-01-11 2:10 ` [PATCH net-next v4 00/18] net: stmmac: clean up and fix EEE implementation patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1tVZEg-0002LE-HH@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=alexandre.torgue@foss.st.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=joabreu@synopsys.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).