devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Théo Lebrun" <theo.lebrun@bootlin.com>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
	 "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	 Jakub Kicinski <kuba@kernel.org>,
	Paolo Abeni <pabeni@redhat.com>,  Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	 Conor Dooley <conor+dt@kernel.org>,
	 Nicolas Ferre <nicolas.ferre@microchip.com>,
	 Claudiu Beznea <claudiu.beznea@tuxon.dev>,
	 Richard Cochran <richardcochran@gmail.com>,
	 Russell King <linux@armlinux.org.uk>
Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"Vladimir Kondratiev" <vladimir.kondratiev@mobileye.com>,
	"Tawfik Bayouk" <tawfik.bayouk@mobileye.com>,
	"Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
	"Grégory Clement" <gregory.clement@bootlin.com>,
	"Benoît Monin" <benoit.monin@bootlin.com>,
	"Maxime Chevallier" <maxime.chevallier@bootlin.com>,
	"Théo Lebrun" <theo.lebrun@bootlin.com>
Subject: [PATCH net-next 07/15] net: macb: simplify macb_adj_dma_desc_idx()
Date: Tue, 14 Oct 2025 17:25:08 +0200	[thread overview]
Message-ID: <20251014-macb-cleanup-v1-7-31cd266e22cd@bootlin.com> (raw)
In-Reply-To: <20251014-macb-cleanup-v1-0-31cd266e22cd@bootlin.com>

The function body uses a switch statement on bp->hw_dma_cap and handles
its four possible values: 0, is_64b, is_ptp, is_64b && is_ptp.

Instead, refactor by noticing that the return value is:
   desc_size * MULT
with MULT = 3 if is_64b && is_ptp,
            2 if is_64b || is_ptp,
            1 otherwise.

MULT can be expressed as:
   1 + is_64b + is_ptp

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
---
 drivers/net/ethernet/cadence/macb_main.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 7f74e280a3351ee7f961ff5ecd9550470b2e68eb..44a411662786ca4f309d6f9389b0d36819fc40ad 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -136,19 +136,13 @@ static unsigned int macb_dma_desc_get_size(struct macb *bp)
 static unsigned int macb_adj_dma_desc_idx(struct macb *bp, unsigned int desc_idx)
 {
 #ifdef MACB_EXT_DESC
-	switch (bp->hw_dma_cap) {
-	case HW_DMA_CAP_64B:
-	case HW_DMA_CAP_PTP:
-		desc_idx <<= 1;
-		break;
-	case HW_DMA_CAP_64B_PTP:
-		desc_idx *= 3;
-		break;
-	default:
-		break;
-	}
-#endif
+	bool is_ptp = bp->hw_dma_cap & HW_DMA_CAP_PTP;
+	bool is_64b = bp->hw_dma_cap & HW_DMA_CAP_64B;
+
+	return desc_idx * (1 + is_64b + is_ptp);
+#else
 	return desc_idx;
+#endif
 }
 
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

-- 
2.51.0


  parent reply	other threads:[~2025-10-14 15:25 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-14 15:25 [PATCH net-next 00/15] net: macb: various cleanups Théo Lebrun
2025-10-14 15:25 ` [PATCH net-next 01/15] dt-bindings: net: cdns,macb: sort compatibles Théo Lebrun
2025-10-17 17:45   ` Andrew Lunn
2025-10-14 15:25 ` [PATCH net-next 02/15] net: macb: use BIT() macro for capability definitions Théo Lebrun
2025-10-14 15:25 ` [PATCH net-next 03/15] net: macb: remove gap in MACB_CAPS_* flags Théo Lebrun
2025-10-17 17:52   ` Andrew Lunn
2025-10-14 15:25 ` [PATCH net-next 04/15] net: macb: Remove local variables clk_init and init in macb_probe() Théo Lebrun
2025-10-14 15:25 ` [PATCH net-next 05/15] net: macb: drop macb_config NULL checking Théo Lebrun
2025-10-14 15:25 ` [PATCH net-next 06/15] net: macb: simplify macb_dma_desc_get_size() Théo Lebrun
2025-10-17 17:57   ` Andrew Lunn
2025-10-14 15:25 ` Théo Lebrun [this message]
2025-10-17 18:00   ` [PATCH net-next 07/15] net: macb: simplify macb_adj_dma_desc_idx() Andrew Lunn
2025-10-20 11:58     ` Théo Lebrun
2025-10-14 15:25 ` [PATCH net-next 08/15] net: macb: move bp->hw_dma_cap flags to bp->caps Théo Lebrun
2025-10-17 18:03   ` Andrew Lunn
2025-10-14 15:25 ` [PATCH net-next 09/15] net: macb: introduce DMA descriptor helpers (is 64bit? is PTP?) Théo Lebrun
2025-10-17 18:07   ` Andrew Lunn
2025-10-14 15:25 ` [PATCH net-next 10/15] net: macb: remove bp->queue_mask Théo Lebrun
2025-10-17 18:11   ` Andrew Lunn
2025-10-14 15:25 ` [PATCH net-next 11/15] net: macb: replace min() with umin() calls Théo Lebrun
2025-10-19 14:10   ` David Laight
2025-10-20 11:44     ` Théo Lebrun
2025-10-20 11:56       ` David Laight
2025-10-14 15:25 ` [PATCH net-next 12/15] net: macb: drop `entry` local variable in macb_tx_map() Théo Lebrun
2025-10-14 15:25 ` [PATCH net-next 13/15] net: macb: drop `count` " Théo Lebrun
2025-10-14 15:25 ` [PATCH net-next 14/15] net: macb: apply reverse christmas tree " Théo Lebrun
2025-10-14 15:25 ` [PATCH net-next 15/15] net: macb: sort #includes Théo Lebrun
2025-10-17  1:50 ` [PATCH net-next 00/15] net: macb: various cleanups 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=20251014-macb-cleanup-v1-7-31cd266e22cd@bootlin.com \
    --to=theo.lebrun@bootlin.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=benoit.monin@bootlin.com \
    --cc=claudiu.beznea@tuxon.dev \
    --cc=conor+dt@kernel.org \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=edumazet@google.com \
    --cc=gregory.clement@bootlin.com \
    --cc=krzk+dt@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=maxime.chevallier@bootlin.com \
    --cc=netdev@vger.kernel.org \
    --cc=nicolas.ferre@microchip.com \
    --cc=pabeni@redhat.com \
    --cc=richardcochran@gmail.com \
    --cc=robh@kernel.org \
    --cc=tawfik.bayouk@mobileye.com \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=vladimir.kondratiev@mobileye.com \
    /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;
as well as URLs for NNTP newsgroup(s).