linux-kernel - [PATCH 04/12] ethernet: nfp: Use min()/max() to improve code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20250709022210.304030-5-rongqianfeng@vivo.com>
Date: Wed,  9 Jul 2025 10:21:32 +0800
From: Qianfeng Rong <rongqianfeng@...o.com>
To: Louis Peens <louis.peens@...igine.com>,
	Jakub Kicinski <kuba@...nel.org>,
	Andrew Lunn <andrew+netdev@...n.ch>,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <edumazet@...gle.com>,
	Paolo Abeni <pabeni@...hat.com>,
	Qianfeng Rong <rongqianfeng@...o.com>,
	oss-drivers@...igine.com (open list:NETRONOME ETHERNET DRIVERS),
	netdev@...r.kernel.org (open list:NETWORKING DRIVERS),
	linux-kernel@...r.kernel.org (open list)
Subject: [PATCH 04/12] ethernet: nfp: Use min()/max() to improve code

Use min()/max() to reduce the code and improve its readability.

Signed-off-by: Qianfeng Rong <rongqianfeng@...o.com>
---
 drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
index e19bb0150cb5..ab1b952ff1fb 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
@@ -205,15 +205,10 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
 		resource_size_t map_addr;
 
 		/* Make a single overlapping BAR mapping */
-		if (tx_bar_off < rx_bar_off)
-			bar_off = tx_bar_off;
-		else
-			bar_off = rx_bar_off;
-
-		if ((tx_bar_off + tx_bar_sz) > (rx_bar_off + rx_bar_sz))
-			bar_sz = (tx_bar_off + tx_bar_sz) - bar_off;
-		else
-			bar_sz = (rx_bar_off + rx_bar_sz) - bar_off;
+		bar_off = min(tx_bar_off, rx_bar_off);
+
+		bar_sz = max(tx_bar_off + tx_bar_sz,
+			     rx_bar_off + rx_bar_sz) - bar_off;
 
 		map_addr = pci_resource_start(pdev, tx_bar_no) + bar_off;
 		vf->q_bar = ioremap(map_addr, bar_sz);
-- 
2.34.1