public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Andrew Lunn <andrew+netdev@lunn.ch>,
	bpf@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Jesper Dangaard Brouer <hawk@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org,
	Paolo Abeni <pabeni@redhat.com>,
	Stanislav Fomichev <sdf@fomichev.me>
Subject: [PATCH net-next v2 03/15] net: stmmac: clean up stmmac_clear_rx_descriptors()
Date: Thu, 12 Mar 2026 10:09:03 +0000	[thread overview]
Message-ID: <E1w0cyV-0000000CzG4-05JW@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <abKQWloxp9_4OuJh@shell.armlinux.org.uk>

The two paths calling stmmac_init_rx_desc() are identical apart from
the way the pointer to the descriptor is fetched. Split this out.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
 .../net/ethernet/stmicro/stmmac/stmmac_main.c  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 0dcf4a31e314..765b168df50d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1514,20 +1514,20 @@ static void stmmac_clear_rx_descriptors(struct stmmac_priv *priv,
 					u32 queue)
 {
 	struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue];
+	struct dma_desc *desc;
 	int i;
 
 	/* Clear the RX descriptors */
-	for (i = 0; i < dma_conf->dma_rx_size; i++)
+	for (i = 0; i < dma_conf->dma_rx_size; i++) {
 		if (priv->extend_desc)
-			stmmac_init_rx_desc(priv, &rx_q->dma_erx[i].basic,
-					priv->use_riwt, priv->mode,
-					(i == dma_conf->dma_rx_size - 1),
-					dma_conf->dma_buf_sz);
+			desc = &rx_q->dma_erx[i].basic;
 		else
-			stmmac_init_rx_desc(priv, &rx_q->dma_rx[i],
-					priv->use_riwt, priv->mode,
-					(i == dma_conf->dma_rx_size - 1),
-					dma_conf->dma_buf_sz);
+			desc = &rx_q->dma_rx[i];
+
+		stmmac_init_rx_desc(priv, desc, priv->use_riwt, priv->mode,
+				    (i == dma_conf->dma_rx_size - 1),
+				    dma_conf->dma_buf_sz);
+	}
 }
 
 /**
-- 
2.47.3


  parent reply	other threads:[~2026-03-12 10:09 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-12 10:07 [PATCH net-next v2 00/15] net: stmmac: clean up descriptor handling part 1 Russell King (Oracle)
2026-03-12 10:08 ` [PATCH net-next v2 01/15] net: stmmac: rearrange stmmac_tx_info members to pack better Russell King (Oracle)
2026-03-12 10:08 ` [PATCH net-next v2 02/15] net: stmmac: helpers for filling tx_q->tx_skbuff_dma Russell King (Oracle)
2026-03-12 10:09 ` Russell King (Oracle) [this message]
2026-03-12 10:09 ` [PATCH net-next v2 04/15] net: stmmac: add helper to get hardware receive descriptor Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 05/15] net: stmmac: add helper to get size of a " Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 06/15] net: stmmac: add helper to set receive tail pointer Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 07/15] net: stmmac: remove rx_tail_addr Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 08/15] net: stmmac: use consistent tests for receive buffer size Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 09/15] net: stmmac: add helper to set " Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 10/15] net: stmmac: simplify stmmac_set_queue_rx_buf_size() Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 11/15] net: stmmac: add helper to get hardware transmit descriptor Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 12/15] net: stmmac: add helper to get size of a " Russell King (Oracle)
2026-03-12 10:09 ` [PATCH net-next v2 13/15] net: stmmac: add helper to set transmit tail pointer Russell King (Oracle)
2026-03-12 12:34   ` Russell King (Oracle)
2026-03-13 19:50   ` kernel test robot
2026-03-13 20:10   ` kernel test robot
2026-03-12 10:09 ` [PATCH net-next v2 14/15] net: stmmac: remove tx_tail_addr Russell King (Oracle)
2026-03-12 10:10 ` [PATCH net-next v2 15/15] net: stmmac: use queue rather than ->queue_index 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=E1w0cyV-0000000CzG4-05JW@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=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=hawk@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-stm32@st-md-mailman.stormreply.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=sdf@fomichev.me \
    /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