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 v3 11/18] net: stmmac: remove priv->eee_tw_timer
Date: Tue, 07 Jan 2025 16:29:23 +0000 [thread overview]
Message-ID: <E1tVCSJ-007Y3x-C0@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <Z31V9O8SATRbu2L3@shell.armlinux.org.uk>
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>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux•org.uk>
---
drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 -
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 507b6ac14289..1556804cca38 100644
--- 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 adc51087f2ba..94bb6b07f96f 100644
--- 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,
@@ -3446,8 +3445,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;
--
2.30.2
next prev parent reply other threads:[~2025-01-07 16:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 16:27 [PATCH net-next v3 00/18] net: stmmac: clean up and fix EEE implementation Russell King (Oracle)
2025-01-07 16:28 ` [PATCH net-next v3 01/18] net: phy: add configuration of rx clock stop mode Russell King (Oracle)
2025-01-07 16:28 ` [PATCH net-next v3 02/18] net: stmmac: move tx_lpi_timer tracking to phylib Russell King (Oracle)
2025-01-08 7:36 ` Choong Yong Liang
2025-01-08 10:07 ` Russell King (Oracle)
2025-01-08 10:40 ` Russell King (Oracle)
2025-01-08 10:58 ` Choong Yong Liang
2025-01-07 16:28 ` [PATCH net-next v3 03/18] net: stmmac: use correct type for tx_lpi_timer Russell King (Oracle)
2025-01-07 16:28 ` [PATCH net-next v3 04/18] net: stmmac: use unsigned int for eee_timer Russell King (Oracle)
2025-01-08 10:10 ` Simon Horman
2025-01-07 16:28 ` [PATCH net-next v3 05/18] net: stmmac: make EEE depend on phy->enable_tx_lpi Russell King (Oracle)
2025-01-07 16:28 ` [PATCH net-next v3 06/18] net: stmmac: remove redundant code from ethtool EEE ops Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 07/18] net: stmmac: clean up stmmac_disable_eee_mode() Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 08/18] net: stmmac: remove priv->tx_lpi_enabled Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 09/18] net: stmmac: report EEE error statistics if EEE is supported Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 10/18] net: stmmac: convert to use phy_eee_rx_clock_stop() Russell King (Oracle)
2025-01-07 16:29 ` Russell King (Oracle) [this message]
2025-01-07 16:29 ` [PATCH net-next v3 12/18] net: stmmac: move priv->eee_enabled into stmmac_eee_init() Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 13/18] net: stmmac: move priv->eee_active " Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 14/18] net: stmmac: use boolean for eee_enabled and eee_active Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 15/18] net: stmmac: move setup of eee_ctrl_timer to stmmac_dvr_probe() Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 16/18] net: stmmac: remove unnecessary EEE handling in stmmac_release() Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 17/18] net: stmmac: split hardware LPI timer control Russell King (Oracle)
2025-01-07 16:29 ` [PATCH net-next v3 18/18] net: stmmac: remove stmmac_lpi_entry_timer_config() Russell King (Oracle)
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=E1tVCSJ-007Y3x-C0@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux$(echo .)org.uk \
--cc=alexandre.torgue@foss$(echo .)st.com \
--cc=andrew+netdev@lunn$(echo .)ch \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=hkallweit1@gmail$(echo .)com \
--cc=joabreu@synopsys$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-stm32@st-md-mailman$(echo .)stormreply.com \
--cc=mcoquelin.stm32@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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