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 11/15] net: macb: replace min() with umin() calls
Date: Tue, 14 Oct 2025 17:25:12 +0200 [thread overview]
Message-ID: <20251014-macb-cleanup-v1-11-31cd266e22cd@bootlin.com> (raw)
In-Reply-To: <20251014-macb-cleanup-v1-0-31cd266e22cd@bootlin.com>
Whenever min(a, b) is used with a and b unsigned variables or literals,
`make W=2` complains. Change four min() calls into umin().
stderr extract (GCC 11.2.0, MIPS Codescape):
./include/linux/minmax.h:68:57: warning: comparison is always true due
to limited range of data type [-Wtype-limits]
68 | #define __is_nonneg(ux) statically_true((long long)(ux) >= 0)
| ^~
drivers/net/ethernet/cadence/macb_main.c:2299:26: note: in expansion of
macro ‘min’
2299 | hdrlen = min(skb_headlen(skb), bp->max_tx_length);
| ^~~
Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
---
drivers/net/ethernet/cadence/macb_main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 98e28d51a6e12c24ef27c939363eb43c0aec1951..6c6bc6aa23c718772b95b398e807f193a38e141a 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -2035,7 +2035,7 @@ static unsigned int macb_tx_map(struct macb *bp,
count++;
tx_head++;
- size = min(len, bp->max_tx_length);
+ size = umin(len, bp->max_tx_length);
}
/* Then, map paged data from fragments */
@@ -2045,7 +2045,7 @@ static unsigned int macb_tx_map(struct macb *bp,
len = skb_frag_size(frag);
offset = 0;
while (len) {
- size = min(len, bp->max_tx_length);
+ size = umin(len, bp->max_tx_length);
entry = macb_tx_ring_wrap(bp, tx_head);
tx_skb = &queue->tx_skb[entry];
@@ -2301,7 +2301,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_BUSY;
}
} else
- hdrlen = min(skb_headlen(skb), bp->max_tx_length);
+ hdrlen = umin(skb_headlen(skb), bp->max_tx_length);
#if defined(DEBUG) && defined(VERBOSE_DEBUG)
netdev_vdbg(bp->dev,
@@ -4573,8 +4573,8 @@ static int macb_init(struct platform_device *pdev)
* each 4-tuple define requires 1 T2 screener reg + 3 compare regs
*/
reg = gem_readl(bp, DCFG8);
- bp->max_tuples = min((GEM_BFEXT(SCR2CMP, reg) / 3),
- GEM_BFEXT(T2SCR, reg));
+ bp->max_tuples = umin((GEM_BFEXT(SCR2CMP, reg) / 3),
+ GEM_BFEXT(T2SCR, reg));
INIT_LIST_HEAD(&bp->rx_fs_list.list);
if (bp->max_tuples > 0) {
/* also needs one ethtype match to check IPv4 */
--
2.51.0
next prev parent reply other threads:[~2025-10-14 15:26 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 ` [PATCH net-next 07/15] net: macb: simplify macb_adj_dma_desc_idx() Théo Lebrun
2025-10-17 18:00 ` 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 ` Théo Lebrun [this message]
2025-10-19 14:10 ` [PATCH net-next 11/15] net: macb: replace min() with umin() calls 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-11-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).