From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
Chen-Yu Tsai <wens@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-sunxi@lists.linux.dev, netdev@vger.kernel.org,
Paolo Abeni <pabeni@redhat.com>,
Samuel Holland <samuel@sholland.org>
Subject: [PATCH net-next v2 3/8] net: stmmac: mdio: simplify MDC clock divisor lookup
Date: Thu, 05 Mar 2026 10:42:37 +0000 [thread overview]
Message-ID: <E1vy6A9-0000000Btwp-0lxY@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <aald--qJquWGIvmO@shell.armlinux.org.uk>
As each lookup now iterates over each table in the same way, simplfy
the code to select the table, and then walk that table.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
.../net/ethernet/stmicro/stmmac/stmmac_mdio.c | 29 +++++++------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 6292911fb54b..c9f0b8b601d2 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -535,6 +535,7 @@ static const struct stmmac_clk_rate stmmac_xgmac_csr_to_mdc[] = {
*/
static u32 stmmac_clk_csr_set(struct stmmac_priv *priv)
{
+ const struct stmmac_clk_rate *rates;
unsigned long clk_rate;
u32 value = ~0;
int i;
@@ -548,25 +549,17 @@ static u32 stmmac_clk_csr_set(struct stmmac_priv *priv)
* the frequency of clk_csr_i. So we do not change the default
* divider.
*/
- for (i = 0; stmmac_std_csr_to_mdc[i].rate; i++)
- if (clk_rate > stmmac_std_csr_to_mdc[i].rate)
- break;
- if (stmmac_std_csr_to_mdc[i].cr != (u8)~0)
- value = stmmac_std_csr_to_mdc[i].cr;
-
- if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I) {
- for (i = 0; stmmac_sun8i_csr_to_mdc[i].rate; i++)
- if (clk_rate > stmmac_sun8i_csr_to_mdc[i].rate)
- break;
- value = stmmac_sun8i_csr_to_mdc[i].cr;
- }
+ rates = stmmac_std_csr_to_mdc;
+ if (priv->plat->flags & STMMAC_FLAG_HAS_SUN8I)
+ rates = stmmac_sun8i_csr_to_mdc;
+ if (priv->plat->core_type == DWMAC_CORE_XGMAC)
+ rates = stmmac_xgmac_csr_to_mdc;
- if (priv->plat->core_type == DWMAC_CORE_XGMAC) {
- for (i = 0; stmmac_xgmac_csr_to_mdc[i].rate; i++)
- if (clk_rate > stmmac_xgmac_csr_to_mdc[i].rate)
- break;
- value = stmmac_xgmac_csr_to_mdc[i].cr;
- }
+ for (i = 0; rates[i].rate; i++)
+ if (clk_rate > rates[i].rate)
+ break;
+ if (rates[i].cr != (u8)~0)
+ value = rates[i].cr;
return value;
}
--
2.47.3
next prev parent reply other threads:[~2026-03-05 10:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-05 10:42 [PATCH net-next v2 0/8] net: stmmac: mdio related cleanups Russell King (Oracle)
2026-03-05 10:42 ` [PATCH net-next v2 1/8] net: stmmac: mdio: convert MDC clock divisor selection to tables Russell King (Oracle)
2026-03-05 12:11 ` Russell King (Oracle)
2026-03-05 15:19 ` Jakub Kicinski
2026-03-05 10:42 ` [PATCH net-next v2 2/8] net: stmmac: mdio: use same test for MDC clock divisor lookups Russell King (Oracle)
2026-03-05 10:42 ` Russell King (Oracle) [this message]
2026-03-06 9:01 ` [PATCH net-next v2 3/8] net: stmmac: mdio: simplify MDC clock divisor lookup Russell King (Oracle)
2026-03-05 10:42 ` [PATCH net-next v2 4/8] net: stmmac: mdio: convert field prep to use field_prep() Russell King (Oracle)
2026-03-06 13:30 ` Maxime Chevallier
2026-03-05 10:42 ` [PATCH net-next v2 5/8] net: stmmac: use u32 for MDIO register field masks Russell King (Oracle)
2026-03-05 10:42 ` [PATCH net-next v2 6/8] net: stmmac: use GENMASK_U32() for mdio bitfields Russell King (Oracle)
2026-03-06 13:30 ` Maxime Chevallier
2026-03-05 10:42 ` [PATCH net-next v2 7/8] net: stmmac: mdio_bus_data->default_an_inband is boolean Russell King (Oracle)
2026-03-06 13:31 ` Maxime Chevallier
2026-03-05 10:43 ` [PATCH net-next v2 8/8] net: stmmac: make pcs_mask and phy_mask u32 Russell King (Oracle)
2026-03-06 13:32 ` Maxime Chevallier
2026-03-06 13:49 ` [PATCH net-next v2 0/8] net: stmmac: mdio related cleanups Maxime Chevallier
2026-03-06 23:50 ` 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=E1vy6A9-0000000Btwp-0lxY@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=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=samuel@sholland.org \
--cc=wens@kernel.org \
/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