net: stmmac: replace ioaddr with stmmac_priv for pcs_set_ane() method
Subsystems (6)
PATCH 1/1 net: stmmac: replace ioaddr with stmmac_priv for pcs_set_ane() method
Pass the stmmac_priv structure into the pcs_set_ane() MAC method rather than having callers dereferencing this structure for the IO address.
Signed-off-by Russell King (Oracle) <[email protected]>
--- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 6 +++--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 ++-- drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 ++-- drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +1 -1
@@ -624,7 +624,7 @@ static void ethqos_set_serdes_speed(struct qcom_ethqos *ethqos, int speed)static void ethqos_pcs_set_inband (struct stmmac_priv *priv,bool enable) { -stmmac_pcs_ctrl_ane (priv, priv->ioaddr, enable,0 ,0 ); +stmmac_pcs_ctrl_ane (priv, enable,0 ,0 ); }/* On interface toggle MAC registers gets reset.
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +3 -3
@@ -393,10 +393,10 @@ static void dwmac1000_set_eee_timer(struct mac_device_info *hw, int ls, int tw)writel (value, ioaddr +LPI_TIMER_CTRL ); } -static void dwmac1000_ctrl_ane (void __iomem *ioaddr,bool ane,bool srgmi_ral, -bool loopback) +static void dwmac1000_ctrl_ane (struct stmmac_priv *priv,bool ane, +bool srgmi_ral,bool loopback) { -dwmac_ctrl_ane (ioaddr,GMAC_PCS_BASE , ane, srgmi_ral, loopback); +dwmac_ctrl_ane (priv->ioaddr,GMAC_PCS_BASE , ane, srgmi_ral, loopback); } static void dwmac1000_debug(struct stmmac_priv *priv, void __iomem *ioaddr,
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +2 -2
@@ -583,10 +583,10 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex, } } -static void dwmac4_ctrl_ane (void __iomem *ioaddr,bool ane,bool srgmi_ral, +static void dwmac4_ctrl_ane (struct stmmac_priv *priv,bool ane,bool srgmi_ral,bool loopback) { -dwmac_ctrl_ane (ioaddr,GMAC_PCS_BASE , ane, srgmi_ral, loopback); +dwmac_ctrl_ane (priv->ioaddr,GMAC_PCS_BASE , ane, srgmi_ral, loopback); }/* RGMII or SMII interface */
drivers/net/ethernet/stmicro/stmmac/hwif.h +2 -2
@@ -374,7 +374,7 @@ struct stmmac_ops { struct stmmac_extra_stats *x, u32 rx_queues, u32 tx_queues);/* PCS calls */ -void (*pcs_ctrl_ane)(void __iomem *ioaddr,bool ane,bool srgmi_ral, +void (*pcs_ctrl_ane)(struct stmmac_priv *priv,bool ane,bool srgmi_ral,bool loopback);/* Safety Features */ int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp,
@@ -464,7 +464,7 @@ struct stmmac_ops { #define stmmac_mac_debug(__priv, __args...) \ stmmac_do_void_callback(__priv, mac, debug, __priv, __args) #define stmmac_pcs_ctrl_ane(__priv, __args...) \ - stmmac_do_void_callback(__priv, mac, pcs_ctrl_ane, __args) + stmmac_do_void_callback(__priv, mac, pcs_ctrl_ane, __priv, __args) #define stmmac_safety_feat_config(__priv, __args...) \ stmmac_do_callback(__priv, mac, safety_feat_config, __args) #define stmmac_safety_feat_irq_status(__priv, __args...) \
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +1 -1
@@ -380,7 +380,7 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev,return -EINVAL ;mutex_lock (&priv->lock); -stmmac_pcs_ctrl_ane (priv, priv->ioaddr,1 , priv->hw->ps,0 ); +stmmac_pcs_ctrl_ane (priv,1 , priv->hw->ps,0 );mutex_unlock (&priv->lock);return 0 ;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -3586,7 +3586,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register) }if (priv->hw->pcs) -stmmac_pcs_ctrl_ane (priv, priv->ioaddr,1 , priv->hw->ps,0 ); +stmmac_pcs_ctrl_ane (priv,1 , priv->hw->ps,0 );/* set TX and RX rings length */ stmmac_set_rings_length (priv);
Signature · 1 line
2.30.2
Quoted 5 lines · Russell King (Oracle)
Pass the
stmmac_privstructure into thepcs_set_ane()MAC method rather than having callers dereferencing this structure for the IO address.
Reviewed-by Simon Horman <[email protected]>
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 5 lines · On Wed, 18 Jun 2025 12:05:12 +0100 you wrote:
Pass the
stmmac_privstructure into thepcs_set_ane()MAC method rather than having callers dereferencing this structure for the IO address.
Quoted 8 lines
--- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 6 +++--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 ++-- drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 ++-- drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
Here is the summary with links:
- [net-next] net: stmmac: replace ioaddr with stmmac_priv for pcs_set_ane() method
https://git.kernel.org/netdev/net-next/c/c8e32755ba2b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html