From nobody Wed Apr 1 22:19:09 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E62E9478859 for ; Wed, 1 Apr 2026 16:39:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775061577; cv=none; b=OcnIqViQOSTdAbNGxnrmqQsw1I6SjfTwUPqukGmZaO085q1n1DtxiAuYQn16oNugB0niC9AqNoODWe9cKphrKgP8u5uTIEQJeKS0OEUk9hROl8jLw7As2Q1KWP4WPrQ/JYIlymhtj0PWZUTfYv/yw6FeMi4eVRkLPRY4P5eMTzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775061577; c=relaxed/simple; bh=p7Luq0FBAy6wiOaPfbXiHVPf61+o5ImPPHQwzl94OEU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kK6mmWT8x1ULRYhzFm4NpZcWB9zN6gFJ/2D7dXJnQkp/MR2zhgoC3GFVJOIOcK7IcxXtgPXtatCrjOhEO41WyAgf2TACul7P1mRKnvsTCIkC1U9XVRcd9Yxw/Cxu3QYRHbKNQKL7UaPTn+czGD0yIIvoCA+NQbFCM9hniI1vFPs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=WJZqPxzo; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="WJZqPxzo" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 6A4841A30C2; Wed, 1 Apr 2026 16:39:33 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 3FCB4602BF; Wed, 1 Apr 2026 16:39:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 31F9110450637; Wed, 1 Apr 2026 18:39:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1775061572; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=LzXtFxzisqeODwJ7M+kJsVHj+h3/fdo/aXOIgPH+rH4=; b=WJZqPxzoDxgKLSqV6DIzBuDbL4Co9jn4dfWSWNQwSAD1swxTvQd7NIQo6l6Bx/E8q+x4Kf UgopVt4fN6enfhXuitg7+ueABP4mZDGigufUosjtKF27md6UKIKvJkV5qv7Rwv9/WMEh2l fZ3zhEDAINqzH5m5Dem3xmvlNU8AiZmtGWE14Im2xtSEgj9GRK81+KzE1RQbxpuNAHdiub 3Citc1ZiL8/G8Oto/fNNc9qdSf6zW7PR+6aPEkWM8aqaWGrXMFrgAIsKYXCLzUcMM1I4B9 bGbXbMeHo0sbDBjMoR3WdPjuOBkZjqiFY6P2C3OXVdUDQsNg+qDTeHteRdB+hw== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Wed, 01 Apr 2026 18:39:07 +0200 Subject: [PATCH net-next 04/11] net: macb: enforce reverse christmas tree (RCT) convention Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260401-macb-context-v1-4-9590c5ab7272@bootlin.com> References: <20260401-macb-context-v1-0-9590c5ab7272@bootlin.com> In-Reply-To: <20260401-macb-context-v1-0-9590c5ab7272@bootlin.com> To: Nicolas Ferre , Claudiu Beznea , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Russell King Cc: Paolo Valerio , Conor Dooley , Nicolai Buchwitz , Vladimir Kondratiev , Gregory CLEMENT , =?utf-8?q?Beno=C3=AEt_Monin?= , Tawfik Bayouk , Thomas Petazzoni , Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.15.0 X-Last-TLS-Session-Version: TLSv1.3 Enforce the reverse christmas tree convention in those functions: macb_tx_error_task() gem_rx_refill() gem_rx() macb_rx_frame() macb_init_rx_ring() macb_rx() macb_rx_pending() macb_start_xmit() The goal is to minimise unrelated diff in future patches. Signed-off-by: Th=C3=A9o Lebrun --- drivers/net/ethernet/cadence/macb_main.c | 61 ++++++++++++++++------------= ---- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 087401163771..081f220f6756 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1250,20 +1250,19 @@ static dma_addr_t macb_get_addr(struct macb *bp, st= ruct macb_dma_desc *desc) =20 static void macb_tx_error_task(struct work_struct *work) { - struct macb_queue *queue =3D container_of(work, struct macb_queue, - tx_error_task); - bool halt_timeout =3D false; - struct macb *bp =3D queue->bp; - unsigned int q; - u32 packets =3D 0; - u32 bytes =3D 0; - struct macb_tx_skb *tx_skb; - struct macb_dma_desc *desc; - struct sk_buff *skb; - unsigned int tail; - unsigned long flags; + struct macb_queue *queue =3D container_of(work, struct macb_queue, + tx_error_task); + unsigned int q =3D queue - queue->bp->queues; + struct macb *bp =3D queue->bp; + struct macb_tx_skb *tx_skb; + struct macb_dma_desc *desc; + bool halt_timeout =3D false; + struct sk_buff *skb; + unsigned long flags; + unsigned int tail; + u32 packets =3D 0; + u32 bytes =3D 0; =20 - q =3D queue - bp->queues; netdev_vdbg(bp->netdev, "macb_tx_error_task: q =3D %u, t =3D %u, h =3D %u= \n", q, queue->tx_tail, queue->tx_head); =20 @@ -1483,11 +1482,11 @@ static int macb_tx_complete(struct macb_queue *queu= e, int budget) =20 static void gem_rx_refill(struct macb_queue *queue) { - unsigned int entry; - struct sk_buff *skb; - dma_addr_t paddr; struct macb *bp =3D queue->bp; struct macb_dma_desc *desc; + struct sk_buff *skb; + unsigned int entry; + dma_addr_t paddr; =20 while (CIRC_SPACE(queue->rx_prepared_head, queue->rx_tail, bp->rx_ring_size) > 0) { @@ -1580,11 +1579,11 @@ static int gem_rx(struct macb_queue *queue, struct = napi_struct *napi, int budget) { struct macb *bp =3D queue->bp; - unsigned int len; - unsigned int entry; - struct sk_buff *skb; - struct macb_dma_desc *desc; - int count =3D 0; + struct macb_dma_desc *desc; + struct sk_buff *skb; + unsigned int entry; + unsigned int len; + int count =3D 0; =20 while (count < budget) { u32 ctrl; @@ -1670,12 +1669,12 @@ static int gem_rx(struct macb_queue *queue, struct = napi_struct *napi, static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *nap= i, unsigned int first_frag, unsigned int last_frag) { - unsigned int len; - unsigned int frag; + struct macb *bp =3D queue->bp; + struct macb_dma_desc *desc; unsigned int offset; struct sk_buff *skb; - struct macb_dma_desc *desc; - struct macb *bp =3D queue->bp; + unsigned int frag; + unsigned int len; =20 desc =3D macb_rx_desc(queue, last_frag); len =3D desc->ctrl & bp->rx_frm_len_mask; @@ -1751,9 +1750,9 @@ static int macb_rx_frame(struct macb_queue *queue, st= ruct napi_struct *napi, =20 static inline void macb_init_rx_ring(struct macb_queue *queue) { + struct macb_dma_desc *desc =3D NULL; struct macb *bp =3D queue->bp; dma_addr_t addr; - struct macb_dma_desc *desc =3D NULL; int i; =20 addr =3D queue->rx_buffers_dma; @@ -1772,9 +1771,9 @@ static int macb_rx(struct macb_queue *queue, struct n= api_struct *napi, { struct macb *bp =3D queue->bp; bool reset_rx_queue =3D false; - int received =3D 0; - unsigned int tail; int first_frag =3D -1; + unsigned int tail; + int received =3D 0; =20 for (tail =3D queue->rx_tail; budget > 0; tail++) { struct macb_dma_desc *desc =3D macb_rx_desc(queue, tail); @@ -1849,8 +1848,8 @@ static int macb_rx(struct macb_queue *queue, struct n= api_struct *napi, static bool macb_rx_pending(struct macb_queue *queue) { struct macb *bp =3D queue->bp; - unsigned int entry; - struct macb_dma_desc *desc; + struct macb_dma_desc *desc; + unsigned int entry; =20 entry =3D macb_rx_ring_wrap(bp, queue->rx_tail); desc =3D macb_rx_desc(queue, entry); @@ -2500,10 +2499,10 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *= skb, unsigned int q =3D skb_get_queue_mapping(skb); unsigned int desc_cnt, nr_frags, frag_size, f; struct macb_queue *queue =3D &bp->queues[q]; + netdev_tx_t ret =3D NETDEV_TX_OK; unsigned int hdrlen; unsigned long flags; bool is_lso; - netdev_tx_t ret =3D NETDEV_TX_OK; =20 if (macb_clear_csum(skb)) { dev_kfree_skb_any(skb); --=20 2.53.0