From nobody Tue Oct 7 14:59:15 2025 Received: from OS8PR02CU002.outbound.protection.outlook.com (mail-japanwestazon11012024.outbound.protection.outlook.com [40.107.75.24]) (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 16A7D1459F7; Wed, 9 Jul 2025 02:23:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.75.24 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027791; cv=fail; b=anNRdSpMlDjL+1j502oCf1Tl+uJzYfNs7qzth0l+dTv0O+8UThqTDdj0D/5Hoqxyo0pzrNThy7lw5jJ5v9WI7Na5cK0DQ71LOgyp5eqIGW9S4O+T6Y/ZL24PdDapbnZiGBFFVcmR7nQ3ddw2VXtmoTiPdOd5yvWpdmWpcE3z7Bo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027791; c=relaxed/simple; bh=DCtbAYIX3k6QrAohZKrBo1Azk3mNrF6nT+KIWRn91l0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=u/Gc4cqF15kQwY2oxM1NtMADiijlKUwfvUHAyFwik9psmAUtxO6H1UcqboIANdnR3eDLroerc2VhaVe6eYi6QSqXtSJRxYvyqTWmKLpuGNaHBFC7VYpIIt5X/Zd5kwx1ozF/HUtrXVCkdsS1Pvfwd5uaYiebVU1zj/IZnocCaEY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=YprumrtZ; arc=fail smtp.client-ip=40.107.75.24 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="YprumrtZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OpngbVbX+FY7P0ubgwxKSPuXX+EyzQ7DL58eoAYrf8uYckeJvXju7XiocDyR/wEXy2EtJLJ1kqP4wHJXi/ynD9DzqT021qCjieNLIstsQ/BuDTZDADZAlECC4Z3AP1trLtqlUVXdbgIgpD1xAROkcwoyQsU/+u5LiTt+UcXqua/Zy6NpsKU2BiPUe0jJNxmUwOv6vkGl5n5E86gvXw33E07cFaAUu5+eoShcFEQ0n+fQOlCJY10KZNeiOSa5vngxTWnUit0/QGJxqzlVBxgiAt4FrA6qh7PS8IC0Wu1FhWBdLcTrydKgsL2HnWLVftnLaXKOuQlkbOoHK9/EXF4CyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mDvRZI7FiZUef8yGxvBz/DryHRdkjQMM2mKFAaeeQmE=; b=wsutLINT7q30ofN0uAfcHQD/NHDCCAbSVB2KgQc6kpKKyOgsaYYTVK65ZrqyBmXmcll/s0D0EQwcZ/NXHXjGmeTh/ItpvkVuEf9Rml7+fG+x3q03iy9f21pCrLAMH/Rc7vgRzkbyBqTeda7++1fq+XPM0WLYhJDZyR+btbxQSvAbq9svC5+GuGP5jkgZ9S7Gbdp3EgaM1+cd/rz+VUYMdVo//QeIBp5UjOLcmdw2nHR0hEKcYPh2ZMchrqdDQBiQOJ6C4YrJqrFH1eT49uSyQm6uwxVJmGcwPMPFA6lh73oxFXDuHwu1j0eF/FvUxoJ0rvW+lgCKbTHcPLWZw/12Qg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mDvRZI7FiZUef8yGxvBz/DryHRdkjQMM2mKFAaeeQmE=; b=YprumrtZnjRqjP6kdIA4ODs9Fx/Sobf0QHRKQcwRXyrK3/TSA1HMVdY7eJB5r23A/9S/wo5+3H7YeVE/Sh+/KhKOyRF68Q3ZK9CmXpYLUrjRpYap0Y5aMHX3mXqNEMLiI5/xtveXypAWhprAgp+bPf6nFfq+W9kdelw2pstb2tu6EotyGhB6+L1mr1O8fbwwbzrvxg/POhVKrQuGVui4cb5Vu4Yl3vYif9PIPjvnN8ccz2yxszX05ZUjQWyBGGqmzkdnOOGg22gl75ERTdXQLzZY6NIVU/m6aCpuWCuwXWzi7rQE3QaEnq8DZCftquN4XS6uP8fqdXKMDg6NiOw8sA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:23:06 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:06 +0000 From: Qianfeng Rong To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Qianfeng Rong , netdev@vger.kernel.org (open list:CAVIUM LIQUIDIO NETWORK DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 01/12] ethernet: liquidio: Use min() to improve code Date: Wed, 9 Jul 2025 10:21:29 +0800 Message-Id: <20250709022210.304030-2-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: 62e679f9-1ce0-45ce-b147-08ddbe8f89ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?OkNPC8Lg6hTyrwwCJ6u27RifDVPXmHYteMvCdKvmcnFlU+gzOptdJ05EVEEK?= =?us-ascii?Q?1gYwI4Xlg1/hXt+bTzhtQd4sGGQ+OJSl+Oo5BRWxFpprrTqNgO0E/Z+C+Jg7?= =?us-ascii?Q?0wfC8+b93sf/3p6kA1YQIGcX5wrGpXyH5c1NMXEehvTbEjcsJ5jcnYnpDYl7?= =?us-ascii?Q?8wuoioT8Y2m3j9LKiA0Qef9BQbv2eDPLalbI+vppr5Z1yHj3q1NImhhTo00y?= =?us-ascii?Q?Ken42cB6o/ZE7yHuAClyshlY6s1B0+ofkH3UL9jmViOJ8oiYWTqfGcshuGBc?= =?us-ascii?Q?LBBDALou08QdfB8caVsvsAkbco/Jpbhld8pNbhxZrrpHMHUXdPJzs2Z6kn3M?= =?us-ascii?Q?5WwgwBSLfL/dg15D5WxSV3OiqDMR7R2QmzFvqZsV//z6JgCzIz8BcC+rUMFt?= =?us-ascii?Q?C/+iN/vzIF7XKStpLzt3SlZimjy6yWXAk3ia3hRmgfEtHNUrpYMHfnOi0v9v?= =?us-ascii?Q?w0a819Gqf8kvrL9pmORFUlv7Pci3tDXTpNOHGpEQ0Md5gxTs5tJ5yqNFtNXc?= =?us-ascii?Q?Lj8EgOCTK0sHpyg9op4kMX04sdtvh10K41ZjGY9uKzGh+MriohnG9QBXw50y?= =?us-ascii?Q?9BCA2qEUMLyxCzBMkYgGClHGwzk+mesZvCidAfQRE8F+SlQzIVKUkFvfJdBM?= =?us-ascii?Q?Sq7FeCKaZNupsA5za0rbi/y9DvGyJfoBzePOl3BWQDfLn+4j2neaVs0AeYIs?= =?us-ascii?Q?xOlr1ZHdixT4FhlgCVX2NEAbF4iNAznTiwtuRP5a3A1978rhJjhVV3gLmMAg?= =?us-ascii?Q?E+wCFEYlf/eVaflauubpoQxGizgj2zDAPcu934KQRmWCB8ipKL7vVI2UD6rI?= =?us-ascii?Q?Ctt2dYFzR53rRHfUc7C9aD5vqre3cgL27tZeglI0LiBI06ScU5XCVEX8fW9w?= =?us-ascii?Q?r5EEysYyiq9Kkzdu1Rcz6CJWnNNyHyjBkk+eGI0CnDZ6qNmm8T2i3h+OsCty?= =?us-ascii?Q?IDWEM9kHRiKb7T8zYTbPhh/8ibR2Fjvt9oayyuF8Lvku0NdpYdfHTQ18DYoH?= =?us-ascii?Q?3P8wVPdoL6OA7o72oITg0cLszZ/jlmu/YMWrs2e/1yFg8uzPDlwV6KXAiHIN?= =?us-ascii?Q?2fXot/lifZYzDqblLBX/ij4fVPpeTEZeQ8ExHt+YZl8F1ji4fEHJdzFizd5l?= =?us-ascii?Q?wQutge/M8QjyppdQs3y6Gn44QzKJ9if45LsSNhEXow/jlownyXtS2K8DLkg6?= =?us-ascii?Q?x5aG60vIg5ACxVxzkR76yctKaB9xhN7HLSZsZf33uP7x8QJGKXBTph0ODMQj?= =?us-ascii?Q?+zsyuKmEH1GUVZv/r4F4fF/PKF15POOiZ4Xv2rxyjhSC3qKiKArXNuXjAeyg?= =?us-ascii?Q?xcNoDnF/o8E7kgtwgZD5etbuFupMz11uCqu+E0RsBN10KeCFSU57KpKtQADB?= =?us-ascii?Q?RRPVjeIaAnoFFQME35xA1DJ/KedQhAMaJ7EhRqUv+u+KH+lySLqntSmeb+4c?= =?us-ascii?Q?1L7xiJPn1ZHCzKdxrCAM1JVzDtjgP+g6oDt7oKiliJ/1N4rD7g0Hxw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xPymS6n63kjzxyYNTPe0nzsh0Si+SIaebCQFegiSDd68VVFQ/FXcK3JpL5f7?= =?us-ascii?Q?HEz4GMRKO5hdvQWym6JBa//Mx7DjqN123mH6XqAGog0FcY3i1eFNPSCFK2D7?= =?us-ascii?Q?cfiWlnRJvXrd4tFcdvAyM1jOTb3CYkZ+3Z1wDUNeq1i0SX+sCe9mvKzOjpel?= =?us-ascii?Q?oTm4DYzAX11KRoEG29LxxhC2SWFxleh/51vwtHOQe0Ce1hh4DWExy1vpP3zb?= =?us-ascii?Q?dkoHgGL98coXxW0zbANK8aFAh2Pyx/0FK1LvGnLenHj+gYHanFCqQhAeg08W?= =?us-ascii?Q?3sWmwe7I2VJjNA7EHUAh4uX0MFortAyKrY1uJVbv5+XUDqpXTxqb9L1m0kHv?= =?us-ascii?Q?ZtiaiUUAl1pQvZ1iVOeCZR9WgFaXEM6Nv1Za4ZhA8ytjlfmlXu6r1mI5iSp2?= =?us-ascii?Q?CqyRNEgxGqpE0m3N0trs5WOuSb1Q/bqMb+tw8S3Zqpb6yq30Aa9O2iC3aCO/?= =?us-ascii?Q?SxTkr+cn2l/zbPuEUgmdxonvX/Ipm5APVk6cvviyvgHqOu7GONDaWQtuGRLG?= =?us-ascii?Q?UtiJEW9e96ebtPTjWGeYf46l1GECWZOPIAUViZtGQp29VljYsJvV4oeD3hqr?= =?us-ascii?Q?BZGxd3eyBxyWJ54tFD5fUh7t0MTGu6hxdPdqxl7zxrfXLQb5QUW3v1/FIRsq?= =?us-ascii?Q?DjMSmmJXuLZQAk7kO72bMme+ZGiiP4j79Q6+0sPezM4U8wKeUvwoAHxeW6HA?= =?us-ascii?Q?fk2/JVAA1vr/GYkVSxDsrJsdw7mYdICIGCHXhYPBBPG1trrYLf5HR9XH5Nqx?= =?us-ascii?Q?qnfUc68FBcHhmg1G4j4adH6toNuvxHVjEjuO8pm8Ib+DDrzlCxApHSmRvFE9?= =?us-ascii?Q?5KE+KYZusmYAC66mVbDgfkNcLGNxIXDBVxOHAnW8UVmII9c2VdQJh5QBpSRV?= =?us-ascii?Q?RufKKp96+YSEpmXKfOrCP3h8TA0QZgXTYLIChqjzEYNue0+X3NR3lIRuFH/6?= =?us-ascii?Q?osxWhdYznGYMQbC5cgxKrJkz8mgoVHGGt/phn2Rre1v+LeCiVTte9h+5CnPV?= =?us-ascii?Q?P7RWQoleDh0lbCcqY+igHpWctclR9bxR6/yCS2WRZJs+27bkN0bcsevjOpxY?= =?us-ascii?Q?vAIZoNxcfR9sTeHDBBoGe9sZUTiOHCmCfUTy/8O3oYp7yaMbeP3sciXKKMp7?= =?us-ascii?Q?GQo8SGCx2TuTuWhwLkvE4+hnmOWFJGhsXOUosUtU2kMFBJ6J0hBhENk9AFS5?= =?us-ascii?Q?uxBPy/tk+nnTGozVvROMW/INDeozKh7I5ZZosVazmUfl4Fx0fMSU78n/l1nB?= =?us-ascii?Q?xfesritgjlDMZ9gWqxHjo25GjyAwMUbY6ekF+vsZHZ8VD0tK499oUGRXCvK/?= =?us-ascii?Q?QWnwQsfyckO61hJIDi7Mf25Wobarb0Sb52tu/KA1bQjH9oceeFophddpeAW/?= =?us-ascii?Q?e0D2yVQBpS6GGZM2uCCD/gM/JnZZS4D4zWqMAOHlrN9q8n7mTDP71z4kOw0E?= =?us-ascii?Q?agf1cOARrHwxSPuxamJS/dhIdhBsSD91WaMN6GVAsLKLKifb/q9TtFKwdYoT?= =?us-ascii?Q?bKdz46+k5zZaA7YShzlfUE/MpM0+B10cZBtci4EJVetU5hhKa1fOzvlJtewF?= =?us-ascii?Q?ZMGskSGT+yzWVII0Pg1r+huoCq11gdavCpqWFa7F?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62e679f9-1ce0-45ce-b147-08ddbe8f89ed X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:06.2395 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xSU71D84o8W/sSJglIdKHyYnEknEUWEmYm9DTiTkdWUqmknnWVIaMcFI5XE+13bRn5QnFxPqoYpsS19tCxGRUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use min() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/net/ethernet/cavium/liquidio/octeon_console.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/driver= s/net/ethernet/cavium/liquidio/octeon_console.c index 67c3570f875f..526cbe2c2a21 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c @@ -873,10 +873,7 @@ int octeon_download_firmware(struct octeon_device *oct= , const u8 *data, rem =3D image_len; =20 while (rem) { - if (rem < FBUF_SIZE) - size =3D rem; - else - size =3D FBUF_SIZE; + size =3D min(rem, FBUF_SIZE); =20 /* download the image */ octeon_pci_write_core_mem(oct, load_addr, data, (u32)size); --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from OS8PR02CU002.outbound.protection.outlook.com (mail-japanwestazon11012027.outbound.protection.outlook.com [40.107.75.27]) (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 DC3741CD1E1; Wed, 9 Jul 2025 02:23:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.75.27 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027796; cv=fail; b=m7G8+E7UTK4TtEANHtz0kpTuyOAzlkEC1fzPRLGhMgrfHhGOMWUKJtjQkac2ncEGy1ktPlwzWx4KyKgoZ5C9r9YcbIbx8H2EZCBB/kg+L2EK+7kmZIsutYZt6zBeMr+///PYBneRBPrqR5zmDKhWPF+mohAWicUsC+AOPxq2HSc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027796; c=relaxed/simple; bh=ektBwy87tJbpb2J2q7St5sG6q3vWmLtc59a3W+l/obg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=orj9EX+wijcHQtRtcqP0HeU4cxofyVAk/UUwA7eGMcugogLa1fF9bXg1ZPe9sAXPb7SIltoUSudoynlwuh6ac8FHZTU3Vr42nqIEKw99PK8yAIpkH/kUaXMqY1rdvDv+ZV/60AXOA4FjmEDEyb+y8+lUZYetS3LzunvqTAW3GbE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=fUH5rBhd; arc=fail smtp.client-ip=40.107.75.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="fUH5rBhd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mm/JcoCpFT8SxH0VA82dwtGiSrvkCVm6LlvdADiPvL+Q6R0EJeZbOnnCXqxL93lbwy3iiRSankQV7ic0OENFAbTqq70sS3Ty08uX5bKo3NUGt5AosHbl5lcrS3VQa7VomVT76otMv6AReWQplQRMGLv+ffQBzsW5SBJrDAxoALW0/Rb+de2gEJ9jfxXRhtjZyKz28/wnr8TvSovi7HTKW5Ach8iEGk4vO/xGBha/z9DfcRHoE2hlKI04q0FqMnLkey98ouGu/+DXIT2D5DHSGdFeIBjVIArP4ypvHSZ7NebTvcQgBqq6SOUgtru28Mu7GBJecJFXJUgtW8rysMVC0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xomhiyVdc0J45bEWALQfjozIsuqjZ2RJA9zbWozOEX0=; b=JXAMnYUlso/QFIvaTPEgGTJJITXZE3VqpbodFVcffxlTgqzn4ki6cdx7H9s7HnqlgqL+XQ8c9ovxUWIJBEWB+bqyKBh+6jSRSoeWwdyYyttF4ClfLOJnRBuz0b7QqH3sBKBsgrnJz2O04IJkfvR3JtlsUu50hxj5sf2Pu7l0xQcv4yHNQJh+XuNcVgjbZDdGilYSPzhvSpznmkAjfzUfq5nHbDpUuKZ2Zcj38MDl2ynTThfL9sGATJmKdyBnESZsH9cJ8zfEMXUxf+RYsdasQ4J/aOdJjOqNbSEIeb5xl3pbPBxebanHC2FUYrOrjr1hUHCy6i8DIXOJQe81EbHYcQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xomhiyVdc0J45bEWALQfjozIsuqjZ2RJA9zbWozOEX0=; b=fUH5rBhdGLnqXfgf0WWtdORpY5uFgeqMav2nZQ7eS9PfEjK3NwSnPY57jTcTGpe3OQySxlIcfyMJ/0cpzUMRJKXmVBIHN1dW8RaROQmCsfU8905ejPEvV+RZhSMWBjdhLFEur+NCU3rcUDOEBG2sf277CnOpt2u7oYEPzqjmHS9UbOG+2uOnkBrJ5HnLp2RoO1P/kkNVLQ5IvWeaCMQPKdZnoPifWmxisBZfvW/uXT708k0g4VGopLwsZEJj0+CMmuqdWks+AVtkq3YGLZ0raStGV+nl39HjkEk8oMY2vnM3/10Hf1QY+5pGku42A45k5sbnQArVLPkRbSJXIZixiw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:23:11 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:11 +0000 From: Qianfeng Rong To: Potnuri Bharat Teja , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org (open list:CXGB4 ETHERNET DRIVER (CXGB4)), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 02/12] ethernet: cxgb4: Use min() to improve code Date: Wed, 9 Jul 2025 10:21:30 +0800 Message-Id: <20250709022210.304030-3-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: a1d91cd8-bddc-42b6-c32f-08ddbe8f8d37 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bVgm70f5XU+pc5IfY24VG2BH4D9PR8P/iE6sHCqWletmV59ARGSOCDez/Fzy?= =?us-ascii?Q?w82mVNisCIl4uA8PFf30TKsDPHPBeS3Qzen5XoCiuN0ouPGpDCXfdGbuPwnK?= =?us-ascii?Q?oUfn78TfXuijCeCm8FTAFSCwL0ujVaJtYHze8Mwv+pmdYPXSvalw5WwEMjxc?= =?us-ascii?Q?qAnYXySf6U7NiXJai3Xo5HzGqOaOQ6wFE9WNTHInSD05hhMbwkdnDyN3UYqF?= =?us-ascii?Q?Cw+5su3xx77ZtOY1+wvT7706o3+tvmDmFeSZtWIevqfJCh0YRHiV6rziN4Mu?= =?us-ascii?Q?Rcsw94ACh2HCFWjIykC0PZ27dNoci+RCkU2NZ3N7cGD1UEwiB9hqa9GYHWOF?= =?us-ascii?Q?KQWxAA0y6WvEk3o6lLgg6Om6rl3nIHrdL8kuEe0xIcvm9J0FGdPlRWfDsIsM?= =?us-ascii?Q?RcRTWCvnRPN19w5InnuJKVdHMTSnrY3YXOg6K5PAw5bioo+1j8nxaITB42i1?= =?us-ascii?Q?2aUEdQR4vpx2cC6DRzaJsnwX6ReDTy9KrMCxeq/0BDrWOrUQj766d1Nn9k8Z?= =?us-ascii?Q?U1H+XaXRgyFj8T9aBe9Zt4old6Lm/uRJqBqv6sQg8mP0aaxx7JLTaTvBi/r6?= =?us-ascii?Q?cvvoT9eEsX8mVEPKRHrgp5HLrAtNabRua5VO+DWYES35OqP9kEglsl3B0HcN?= =?us-ascii?Q?bntqw1rY0sMWmyepgyqj3OtmS5f0bSt3rztUP8eBOi+RIaUFgY3rPDnXZJSL?= =?us-ascii?Q?QxubE6vGj6gJaw11Y1LoHu0e8wXJ2pc3fUpW7tBJojglE489jrx0ACF4R3J6?= =?us-ascii?Q?Rt834VkLneIQ1YCXtdcu1eVUyHX9DNR5WeOMRAlSN6Gy+WUF0wsovp+bw9OL?= =?us-ascii?Q?UGAGfvvxnrwi+DTrByOlmCYyt2vPFw2KmZDfsd6jc9xZyNJMsKR3NDpSSBCA?= =?us-ascii?Q?FRNVYmyiD+HquvBi5h6ymjI+cEtF1QjFeh/8xVB1nfnz6wqa1RwlLXzF3f4M?= =?us-ascii?Q?c7k4PUrEEihbScveyDhqzkjCw9aenkMbp8kgiSlcUJNwLQDLH2KBYnLaQEnS?= =?us-ascii?Q?fDVQyqX3cHDGdj7ptKKQkIKK0FwjomfGNiNI+s3PN0OSi5++eBCQvh5ZBDy7?= =?us-ascii?Q?UVfydjYFeBE14jaCwhOVxdw84O4q679mbQlR+Wyr6BJBOwubFXsQCgJWq8P1?= =?us-ascii?Q?U5LzBsPJQ4xyNQ8Mq8Vy0Z0iDEX0y8Yods7fCrdKOV1RL/EsoWkucvonemAt?= =?us-ascii?Q?gVfXxy0piBm9zUgg52U+b+d4FcvJ4NQDD/hHAlsSd//ijlIHQ7yv1VpK6Np4?= =?us-ascii?Q?V7pD2D8FdNe03ccvfQG1zCUwnj2/0KmmvvzUA7Kx97HopQW+YKqFuT2O6dzm?= =?us-ascii?Q?P+7Mwh5+FXSeGnQt8CT0FSZUan4qOOD72UB4UbQq26WAEc2MbqpnnzF7Lbuf?= =?us-ascii?Q?4BKP0NaRbNhWh86s0VQ4oThWKHRGo4CCLtqb2gMKoOk1oa740I6fz9aBk8Tu?= =?us-ascii?Q?vELlCX/fMw5Map9uMKE807RqCaneztmf/q1C4d6FAmeMr8WI6ehWWA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2yvuOUAQzgl4Gl38oPJoUq6El54cDl5PuZvY3gUo+MoDIiAsLnBlba0txr8i?= =?us-ascii?Q?lpIsm5Wx1VZaOcmv+SORwEduzwuW2m68gx8q6n64IieF5s6MsLxvFHZN6blF?= =?us-ascii?Q?VEk7u7pVo13gxVrInUS38hxIWs9WLRJKia9sTSxgRuJhW8TjAPmFXycBUjXa?= =?us-ascii?Q?Vuad4K2GE3dSuzJA2N4D9esRNRW6TfQHwsrZm7TuXhZD19YB+5z+dfa/1tov?= =?us-ascii?Q?CKc1U9oEHfOeB1dcq9o3xuvz+1e1gLFAhG4uz0KWybuF7b8OJ6leWLZRGUCk?= =?us-ascii?Q?+OzcJdJGuXfgt+bVcWHCXCLKQMBuyHq5kwfQufx/Z3q2S0jNyfIr9z1H6LnA?= =?us-ascii?Q?b3Qb4AWLAwC4PZy3zdHi1TD9k8Tc98BCBQUFKNcK+4o5P5U3IsROnOa4AeOI?= =?us-ascii?Q?mG0aIm0EiT3ontJy3kyyQbTP6WJyjG1hLnyEFcw7JLBNBqEn8zL19VMBo6Ro?= =?us-ascii?Q?yrz4E/dffX8mce7TMXObVBCVuILkKabOMR2M4aMfV4AHr2UWrdUhVwrUC6Zu?= =?us-ascii?Q?6X/JN4yIFPMlo8Ea4GnHkJu1SMYfDurl9p0s1jCy7jjlr2pZw+rG4Dd2nL8r?= =?us-ascii?Q?SOaYN7VWlfzbuXlMESutKxisuTJdAe1buvXkWhTWsvg1V0P4XuZrKBss63g3?= =?us-ascii?Q?VIp7aiNEbRWmiYSUhWRE0COs/+gjtINS8RAvpteqt3kEDQrTKXJyViPggePm?= =?us-ascii?Q?PYdNgJYIHnj6q/Uq911X2eDs+hL4k0srC2oKR3+jMVtuiqRG19kpOIk7lbph?= =?us-ascii?Q?POBYATgKlqutd0vtv+PMqKJnHI8u49I/Q26oIVBuYHm1Wl+QtxVdi8xXvbLw?= =?us-ascii?Q?f8QPrSagXMu1jhkJSNCoTO7p5kLEEdm6i6pGndSnFZ7eneOYxIVNsobnxPgv?= =?us-ascii?Q?d0ybgLnxUOpiffgi20EwcXrrgL7pO+Gu84iqB2wBBhkOG+btBNbxvFiAxbHF?= =?us-ascii?Q?OL6oKy7KB1n6+092xC1Nm8wHy6KNe7spYQzvGpZjj2Cdy0SwUOTIl9N6jkpH?= =?us-ascii?Q?rOQ4qTxwD6XFvkhYRhaToVavmNDP9l5fXvg4OpOvQglVlSPK4ghtM34Yqzt8?= =?us-ascii?Q?DOPlNGCUxiSOdM3pi3G/01ALHfvhIw9SoizHivLDx+U479ohrDa/fCFJLPs9?= =?us-ascii?Q?jyX4vj8qXKKBr3cFYTkPRuAR1DJ0AFMOA3eW7CeFJ25q1L1DD4ojiT4rOMsp?= =?us-ascii?Q?hbghm41oqySA1ZWXGcaBAVrCq9uNdqeiP8HDVSTm/FTYEnqMDHJWjlgY7eF7?= =?us-ascii?Q?tggQeOYtpxRWOTyA980BKgBd1L/yZq9kf5Te/01oBGZxf4g9Lz1o92TVhIZa?= =?us-ascii?Q?rC0GyLv0xGLQb1p7pTYjmBMMz6A8WZWE4V6Ew8OtzWcKYV6A+Gq21eX9njoG?= =?us-ascii?Q?Sa8h1R65cWPHKPx9qYEx0uD0qpbYWeuqPOThGiGOpS59+y7aCzb16DH1XIFU?= =?us-ascii?Q?+xu+hhEUUclj2j0r5/JE4kT1psIYYIMAIoGk0qs+Rsu05qKmYT0Xozo4NY8S?= =?us-ascii?Q?zX7SR+vnNcVRnmRi24EIIC74YyCNJZDywnTWefcEqUaqd7dBlMnt30KSYFBM?= =?us-ascii?Q?pJOsaMfKWthop8A5arv7lkaxpAIj0N3kZlJHa/OQ?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1d91cd8-bddc-42b6-c32f-08ddbe8f8d37 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:11.7147 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j2TRkvqzDPgKgYi0NLiheyE4U5rGDMyDy1zjOdbzw2NZl9f6nQXc6bRiogl3Emg9QD6+p5lHplVjI6TIggXFFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use min() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ether= net/chelsio/cxgb4/t4_hw.c index 175bf9b13058..c9546863bebe 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c @@ -10192,10 +10192,7 @@ int t4_load_cfg(struct adapter *adap, const u8 *cf= g_data, unsigned int size) =20 /* this will write to the flash up to SF_PAGE_SIZE at a time */ for (i =3D 0; i < size; i +=3D SF_PAGE_SIZE) { - if ((size - i) < SF_PAGE_SIZE) - n =3D size - i; - else - n =3D SF_PAGE_SIZE; + n =3D min(size - i, SF_PAGE_SIZE); ret =3D t4_write_flash(adap, addr, n, cfg_data, true); if (ret) goto out; --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from OS8PR02CU002.outbound.protection.outlook.com (mail-japanwestazon11012027.outbound.protection.outlook.com [40.107.75.27]) (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 8B5591D54F7; Wed, 9 Jul 2025 02:23:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.75.27 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027798; cv=fail; b=Garnzozh0NNp96UmLkarmK6j/ts2A1oQL0NNMSiAW+TtzmDhEd/JpNkvxuhxvqUuPCUd80MFFxj8vNcWCiIrpma9QC33vkoM8RLvf6Q/HGYYGlMIDzX+WFkVl2T488xFMkDlgNcljHyL5o6Vx+dTXZM/L6PEksWdhE1Ke6tEEKo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027798; c=relaxed/simple; bh=ow8Qm9HHLFU5MvXgbeURI+2Ys7/CsQhWEBBlflHju3o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=VyMFH8h6c3cvU7uGMfZNNr6x7HqDl/EBVWekWeSJ0bpIZNRID+ZhqNla78RrrDfGP63k2RvRozMHmyY0LIT2pDiHUnGK2mEzaB9nwg0azXpkHoCYoiGWR78Wk6S5GP4PPwljD937iAbInPppQf3dg456+7ed7mO52Kh0/qvDV+A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=f0kMM5id; arc=fail smtp.client-ip=40.107.75.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="f0kMM5id" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KCvK2+uazQ5f8au+E7rNFdkZOb1OEYn7bC2x9xhjXjFLz8GCdVZKuhh4C7lLsyCPYL9LoZTqTJOqvzUrZ1WXv+dMzZsWpS+IZvr7suJEHdFtpZgQUch1okWgzyAVn7IfVzgnxYYBfjvIfWmDpENwY5ixqIpAAAILcLpTNZz+ups57rO99ldvA9PahWjmERoJDYD/nKAD6CADCz8urElLnAzjEeaLs4AkYuTVE3AliiqNTsMK2eGGU+aS1IN0+NxVlMfYReyYgBXQWuNrFFLlujdVUsjnVvm5j8nbYmYlOg1N9RkGeEVLZHj9obB8w7DczNxLD0yVRCVWbC6VkrGmsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=81sT630D/Wj7jkx79TkdajINwWG2wRKsbqKwivrX67k=; b=YUILHr3Ir4G7J5BbrVfFiq5f3NOyEGwUpVBKjsPD5PjhT3uuPC93vk46e0SzDDS96AvDQwtAZ9gcSwawb2BmJM10hsyhmFEdQ8ZKFPb7r6hvvpFJaNGYRDzW3Ng8R4DPBO02egiWNWpcPZprI7ajv119b5IdoHWpFjycCSuot5+7uPGSSsKUUTNdlfqrK4zPouJ7vMmszljezgAxWB+jwDV3o/I0UuLRAv+eKBBtXjyQh1xBxFA71WT+4rKHjfN2XSJppF5p0pWlGcHVEwPwlk6bi2Sox7U/hwkNFPNuK+cxfqnwiewYABbABHqLm6d2oD5E7W3ShxaNcf6RZQWyNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=81sT630D/Wj7jkx79TkdajINwWG2wRKsbqKwivrX67k=; b=f0kMM5idZ/m8G1DGGUQxReaRaJZWsMQ7RRyH2n4B64QmrNIcpWJ0khDwY3o0fP+885gUEydZvLWP3nJpdCrZPLvusisgTxSK9oCZcs+k/bF7QrjIwBf5HwEmo4KHMFzW4PLvrScuCiKrtcZOausiLb93ka3GlaEYyf73++F69vLnS9jCpZ7B2ej/fyAGBtGbpZXFaM3tDsTSiwdzzHvRrC24NYCBhWGzJxE8Vic5LSPuLF8egGH1WSyg6Pob9UIAHfWejNHmgTmY3aUWqyi+1yT5lLXs4cftElmMOTgRCPubIRv5PG+XxHrTEtBobkKEzEzRxQRFkCDwd668laTj7w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:23:14 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:14 +0000 From: Qianfeng Rong To: Veerasenareddy Burru , Sathesh Edara , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org (open list:MARVELL OCTEON ENDPOINT DRIVER), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 03/12] ethernet: octeon_ep: Use min() to improve code Date: Wed, 9 Jul 2025 10:21:31 +0800 Message-Id: <20250709022210.304030-4-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: 99fe82f7-c504-4499-0581-08ddbe8f8ee7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?FhR49UAbaggwBPzejfU1IrtOJYKlp9Ysj3uO82ywrqkCfLiWBqE75ozjtDsR?= =?us-ascii?Q?aJLRz63EhC5GIYh9i/ziNxZuZG9lArwayZFZgH0jrH4nJIqKg0CR/7KygPi4?= =?us-ascii?Q?l81eVeOGKNuYfAhmz/QeSs/Lt6eN3IIjaNivCYw2uOdlZSp+iGFr7vb7m+9L?= =?us-ascii?Q?+mdWGOPic2Ym9Fa23ki69k3279ObYbDTgrUqvrvJJRFVxaBzsydzkKjaO44W?= =?us-ascii?Q?nJ9AoPzvmtJGrYDFCEqGgkD5ZW2FqSt6ayfHq83ytUDaTDNc3GmCpNB1xMDC?= =?us-ascii?Q?e6OZjd0lSucIgWSxNUSK7iUhFvqjtlhoIgF049dE94aMXYMyEuXfEo5fjd9I?= =?us-ascii?Q?jydSdFmMDCd/RBSVF+yu0NLojzy0B1VxmDMpu/iAUpTGSDnnfDJy2bgC4ngs?= =?us-ascii?Q?qb63svHS6bnPjQG7BmebTtsxMsIidPbK6XAa6XNVQLlOP7+EHITVmndaJLoX?= =?us-ascii?Q?wAjJoKz7DTVlKd3Qsr/j+uvC4mrtjRDX0x4Y1ogi7GMbyHLVLizsYxZ+Si/C?= =?us-ascii?Q?blkdabVsQxTAe4Z9rE8TFQsBOimKCwrDKr3lAbB4EIqx7CwOTlt00eGOA5T4?= =?us-ascii?Q?ngAg0MUrVQe1tocITc88q2FPIcUF1HX1etIgdb/MK65G5tDic7R9Ho2DR4zh?= =?us-ascii?Q?FwmSQC+fp8CR5rvQETCyFbGRVrAXqCUNl23pJZEYnXxzTD34fVpehUUsdcau?= =?us-ascii?Q?zN+TvHgTQYq+e3flBJPW9zzMIghjg2srgNqh7cgZcgSe3l1B0tM30/z5oFIW?= =?us-ascii?Q?ldKuLTxdbop7dBezIFx262+88AJ3tJYe/dz3W/yd5236fZ+SoAkmvPE8z+GC?= =?us-ascii?Q?D9Tr7MHa+IiNShbqM6kcTG6OIta8V3dfTMXIe8W8o8AfJ5Ytq0aYB6ynQAq5?= =?us-ascii?Q?WEJIgpDCrXMeiojm1Wzi7xMY7YkvgeYl0UmS1mR1O/G30veIwcTtbFPBsHI2?= =?us-ascii?Q?NlqhBcU4Es7dPq70YpZR0ra7sOAOjoZR3Tw8pdeSIxzwwk72ZKdgN7zpE1iv?= =?us-ascii?Q?yPbVt9kok2wERUUkZkVKitFU5r/WXG3bUzzlBVyaVBoN+AKC9BqhyOYrFZof?= =?us-ascii?Q?dHd2BP4gfaXW8W9GoabJbQWDu9UQGVURs3yp9r4TJxP5V4OVF3hF9ahxzLP9?= =?us-ascii?Q?VMP8dYVFp59XH5ArXVJEoBWDC+MQCbXV3gDj0xbNVfXlA4Hd+u8KhW9HYgBe?= =?us-ascii?Q?w1jfAXNGjV2/uv2rw0+KilRpXTsL0APYUhBE6JcqkI/1ZjeWTrgJQK8HFOUO?= =?us-ascii?Q?dnR3arn/lYZkfCmNNqQIqBC49J71WnK9wc/prR6woxJEAfHPgxbS0sEBvSM2?= =?us-ascii?Q?Il0S6neBRyXhntWO87lDM8liKvJ8fnRcLO7YP8yf4Nx5eYEjMU6fkxiD4Vs9?= =?us-ascii?Q?xtYq0JRjUwogWjwfNucTAwtm2UaFt+FXzX5lDI6gAVolQimdn6BLreK6231w?= =?us-ascii?Q?zhZEoVZY5gYAP8XSpTK5aEEVgm/wUelteW3h3fimpXJBHUGbwa3cnQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZQHcG9jX2iftIt5vxKzmxki8ZSqZ3n7oJYCz/wFmt5Q1+VeL9NBylGtXH6gN?= =?us-ascii?Q?IjBFRvtym5kctpi0HWwoXVgXy3Pk974CP8eb0ZhwTLlvLyxcKP9JSj98ijiB?= =?us-ascii?Q?btBnwTylcCWRux/6vqBRFxHwW8zi4s7NKVgSSQ646NXQ4fNeMQHkN/ZHcDRI?= =?us-ascii?Q?vbOe0WU1b3QaeNvt1mxmBt3MBXR9/X7CiHzGmS4IqDvvk/5goOP+uSNgbFsw?= =?us-ascii?Q?MaAQiKRsYdkUK6Y1nm1H/AlE6bww5pYKvahaceuxUpWbwJfSjA/qB5lcL9Zn?= =?us-ascii?Q?sSnOtp/PIqnPHVEWIp/1zyULCjMTDpSTTOvWyGTdYNkT6onY/tGNmXB8Up/b?= =?us-ascii?Q?BXfNC11rEcA/Mp3kwMZQsteuTzYRqu7BvaVm4SSAae/HuKpDwd8PCVkH0+wf?= =?us-ascii?Q?fBerxklYN+5mkUigVJxNx/P4dqE6Iv3Gs5eEk1+AS4qebARuiHM9smOtyhDH?= =?us-ascii?Q?IWuvMprxbiw6NbRkpLMXDSSTOWQ6NhVW1MQHQrX+D67JNFnGXQdF5QnKfJSg?= =?us-ascii?Q?3VXfXzoXnYa8S4al2MZCQH6Gv9IAlMgO5eOEEsvisir+7V67GLbym8g5JDsy?= =?us-ascii?Q?qDEZ2UQbLe2odVb8b9ukp7M26JHwMF83qskiwRmAQsKL1J5U3a+rPTdz0p54?= =?us-ascii?Q?MWd5rrq15VSXJr8NfDFGJM6+DISwzpbXJHH94S/SQmvKRcODtDod49JeZccJ?= =?us-ascii?Q?i1qDkhYhZWHOM9Sc0RqbNZTI3xPctQhzTp0Y5a46/iquIymLQakoNzP5ZBFU?= =?us-ascii?Q?qUJOpzci9KDz9xwGDshu1XEqteZHg5gWZBb7FNQ6mxcBwfNCOY9iZdT9/aCB?= =?us-ascii?Q?hn17n4C2YK7/vMTP4tVSOXdJCA63Q4bPwaq4SP+gI+z/wX0tRsfddwk3SHkv?= =?us-ascii?Q?Z7qUkgPNNOlYQAjjZ3SRg4JcsGgLFMmqFTNwzOSuR2kFXRuz5G0ZuEG+KEz4?= =?us-ascii?Q?KPG8pDT/Prum8maNv6ZJnAcbB8CrAfkv73s4HmCUThLy4hTAFusM+H6gIrOo?= =?us-ascii?Q?oh65SsupZpYzwoeN8FHDP/rl3f+52T/Bn3goEzu0kvVHkL6SAPGZP69SCrnr?= =?us-ascii?Q?F9fA6o0lGNFq3CjTLjmtTRII/TxEtUX0aq6LEEP8eLf19xszlp0TKdM9r3g4?= =?us-ascii?Q?lQgqZmREWDCPyEeh+8lG2lDSTvc397XvN6Id6legsq1mNs12PHXELOWwTC0T?= =?us-ascii?Q?FEniePd8q8ghNRDNKUq1t6KxZUvQunlFbU7hW6jhVeDye4by9oKlT06lad8a?= =?us-ascii?Q?EhO063qXJVrUNztlMOcnD6Lf3sYayjQh2aH3KMmiR3fRmGtpc27UGDBk27VO?= =?us-ascii?Q?LmvSuv/nvbmRMH01eYnMFqvv+AecEpbAutq9jwgcq7fVvQw6nzqxssd3UFYq?= =?us-ascii?Q?koqMr8JP3pt6Qr1mnC/yNLrFNkqM77H+ZMF64vBZ2aiAGdnKrse/juLyIzVv?= =?us-ascii?Q?sScFI3jczNPvvEajEY3BnMNhBqd8H4cq5y/6/9pk33IgeHze3s+FYauHFJBr?= =?us-ascii?Q?ngyiGPUABZJWOHWnogoOMxMaqG3kxttZdYPjDqRSwEsm/+NroJpE4nC7LGlI?= =?us-ascii?Q?qFKnh55bxcEz47aFQIfBFkeydZ7MnFiCSiI6CVwN?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99fe82f7-c504-4499-0581-08ddbe8f8ee7 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:14.6590 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: L4dOry41l+xGkaTCnZ4T5o78A/yfVYgmf2sEvYc4W83w44WS6XC4kgcJxBoORCUey+VbX4QYIqtzsALWy3UrIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use min() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c b/dri= vers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c index ebecdd29f3bd..cfae09bf6fea 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c @@ -39,10 +39,7 @@ static void octep_pfvf_validate_version(struct octep_dev= ice *oct, u32 vf_id, =20 dev_dbg(&oct->pdev->dev, "VF id:%d VF version:%d PF version:%d\n", vf_id, vf_version, OCTEP_PFVF_MBOX_VERSION_CURRENT); - if (vf_version < OCTEP_PFVF_MBOX_VERSION_CURRENT) - rsp->s_version.version =3D vf_version; - else - rsp->s_version.version =3D OCTEP_PFVF_MBOX_VERSION_CURRENT; + rsp->s_version.version =3D min(vf_version, OCTEP_PFVF_MBOX_VERSION_CURREN= T); =20 oct->vf_info[vf_id].mbox_version =3D rsp->s_version.version; dev_dbg(&oct->pdev->dev, "VF id:%d negotiated VF version:%d\n", --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from TYPPR03CU001.outbound.protection.outlook.com (mail-japaneastazon11012019.outbound.protection.outlook.com [52.101.126.19]) (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 79FA1136E; Wed, 9 Jul 2025 02:23:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.126.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027807; cv=fail; b=t9PlqMnJ38khgpdnr0ND/2HKhhkakns89SxmW/jNBU2zyOJwLE5BtrwzPPXskbty1q2F72Mq0KxPNC0Ea8FTR4sM8XIJnqL9+C1ssv+VPAJDTHlQNMVwozMSS4RE/RBkUaA9Yh7bT8yGLC0GDxCND2Vjcf0ijBrbCj/EJoWnt5Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027807; c=relaxed/simple; bh=XNR9jdIHT+TznoFs5CfwPbHcaK9UGC00uefG12pdpkk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=FtD2c3tO9Vi1WibPVsU/PwxvmKxz5FwPnKiRBIudeILXE/wctjaLIL9GL7BdglcGRaNPGveeb5hiCbxRdGVlQF5jveBUFfE4K4p+W4IPD6WTM0eJpnFlqXv41pyVfkuCmIZdL4CxI7536huJ7PQabMTVCYyXG9ImbXHzwRJ5nts= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=dxIUYjsL; arc=fail smtp.client-ip=52.101.126.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="dxIUYjsL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jckeRt57CRywiwDW7AbwOSSI8++QbXrbYnekd+qMuOQ506dIFwhaTKl6bKoM6OgDjbFsda5ygHg9A03MD4IErBxwL4TKjy0iRIwmICZd6+EBhgJt+YIWFXmLfhBV4Q+aDGmaSTum7VhtSoWvf6peqyXTMY1x48u1jCZPOdGrmCpA/IlVnbw/ai/eD/ox4Ykh+JMEd4R/BzX15pUvYpBWaal8aNigD/42MN7hwisEs0rOqwz+hDpOa3T7XpTnC1yNXYuySieV0ehftsnT09fAVIH/Zu4nbtwtnJ+h9vm6fvjya45UdrgfZFrL74781yFoqD1xn04ysjvbQpPr2P1m4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6hEYkfR21l7InawvTbIXeqjYkX9Lq5z+0tOtk/6NKIo=; b=PUpjaXCe85g6o56mdhrMa4ybJ2jsZ/48riagL4qa0z0sqcmryB6h5eyiNnQlcgD77XGwl8OaejuNCKy3y7ONbtqzgrNgMvci9ijx/ipaAiVdRS+Yr9AfK1vc55aNslE0rZ91G/hSxt/gMXpD08WrbD63EDdKYadnRtiVoEqe8vCJO5v4DpX6vJ1P4et3QVcXzZtvtBxNXCu/h4ilf9XtK+oGw3NakJPFNuEskHw2/RD3PFXwaVC+FopSBlpbiQw92GHo8Fvog0aCSuKhqJH1GyOciG9avjD8dlKszuWcnsbxlQ4nj3468MYnubvlXFE0ou3fhiVDbIwI9e6pXNULmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6hEYkfR21l7InawvTbIXeqjYkX9Lq5z+0tOtk/6NKIo=; b=dxIUYjsL8e/nb5d7aVpP8F84voKJJ0RBTScw52R1XF+5fbZlzBaS1pv2/+wl/2tsjYDulIpZfODVxah3a5aXIJBuQpyxjAeQJLbEfgwF8BvFg76Sxug45MUZ+s9t7cDutuqYLUDjfR0wuPFRpTiXCEB9wB5K5QJP1e8jFdTpIKu/SekIa5o4ZrPt7pi20DCaxJw6+2BDSn0c7Y50ZzYivTOejvJj1xI4ASFA0cgV8VjL2mW8pu452T0OBKtXoKP+66lPnoZUEpfHrGyeeCAO+r3umghwGt7m3hMhESwnnaeWJqk47RPfF6vg7/lLb1H+mjB69YC/ZfiwXG4V4QH/Aw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:23:22 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:22 +0000 From: Qianfeng Rong To: Louis Peens , Jakub Kicinski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Qianfeng Rong , oss-drivers@corigine.com (open list:NETRONOME ETHERNET DRIVERS), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 04/12] ethernet: nfp: Use min()/max() to improve code Date: Wed, 9 Jul 2025 10:21:32 +0800 Message-Id: <20250709022210.304030-5-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: 173cebda-b8ee-4b62-a3cf-08ddbe8f9370 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?gXUxHz4X2HbpX/ug6dBqOrMLXO4C80yg2Qx/TGnKYLcBTSb04dAN6p/WxNCk?= =?us-ascii?Q?FCnSstcKGccBBsfutR6Uhfx56WT9NW30SDE994UHgtpRymJlMNl1rg2gKMcB?= =?us-ascii?Q?YIMTTyTQKsu96aTOmo6e4IOOSEIgZDCdYmkU4iHkWys66Ekyc51xj3D7aJ2d?= =?us-ascii?Q?HSgVqXfKhS1m7/+IkSbGp0zojr6B6b4ka784QI41B9XikpebPi5+S7mbfJXw?= =?us-ascii?Q?b2IJuvgAo/nrU4DJiA8P5nTTlUg2P7uGrRs6DHNnBaxoAfbjslWJFjuUp+vs?= =?us-ascii?Q?vdJhuw1ThlUY73NUCspatIJ9fMcl9E95BzkN49D94meSTqw0kpEFvNrB1y56?= =?us-ascii?Q?fYXdU9sX9YxDoNWLZomVESGLQLTpI1cKnVLYBJq2bCzlO2cDjg3Vfov19WXq?= =?us-ascii?Q?w1Vn5ZS14P0pBgJddfPno3HtK3Ce5DVP3Rnhmmc2tF3WKBTBVRraE0Zs7ex9?= =?us-ascii?Q?l1WPq3i3CJmOE2u7mCiMP9CeqJ0YYTYAfTdQNZr89c6kd1HdQddjWLdZLfXK?= =?us-ascii?Q?okxou4Avkn8i6slpD2YXbEw+ejK1Ln6My07q/AMuO8+N9ubbs6vj2xIo2QN/?= =?us-ascii?Q?5xaMAaGV8UyKWjwm56/KiIGjJAgiqny9/0D3FKA7ALfWQ070PjfTbM4TcmpT?= =?us-ascii?Q?XSpLWb7984c9fc/OyE2jbzkeY/YkuB91FsaRhbONZkLqznzVJ384yN5dd3qW?= =?us-ascii?Q?LFbsD4qhUgkW5rGiz/isjhZgN9b8CgWhfNDlHai4kSrXcVgGKgw34Fq+OiMw?= =?us-ascii?Q?N4HnMF+xPZerfpCtSKQ0Ss/FL+pvBrObZqdewoqEm4RVcarn7rGbPGlAQWpY?= =?us-ascii?Q?4yMcquDcOK2r/F1LOdyFfgDviL0iWKfDKQqaXX4PhsRix6n43vgtLF1ORgmU?= =?us-ascii?Q?jF8/mMRYPC7aILsfmK6amLlKmF0K8QZ8hrsVGGZw7mR5DALAir6eM+WWImkH?= =?us-ascii?Q?+LxaBgIZC61wsMdz3QG5IrSqTVw5hWUDhW4Hlv1o9YUAeKuJA/I3BiiY7x6X?= =?us-ascii?Q?XEUZcSwomIBwSaS1gH6jOQ8i0nxAj9ErlOFhgHAI+yIabpH1GV0xAe/6AuHz?= =?us-ascii?Q?NrPmHvqIpvb4CZKuaprXHkZLYlvtu6gAZFGWK369NNlLhbeQS5Ix3HZfF7HK?= =?us-ascii?Q?cE/8aeUZthGp4LosIhEqpaw82Nl93lrpPdlSIkU0eRExlf467D+5S0UWe4/V?= =?us-ascii?Q?PweW0aIhZdfA3V1qqArkzwVoEIwDY0wLAiOIUSqcwCCXQnzMKaxW1HdjT2Z0?= =?us-ascii?Q?aSe3K744OH+sUqY5gdbOcgZQUfXcrQj7uCyvczt/Wt0AwxDwA4/sy4phd94m?= =?us-ascii?Q?QF03PpzYt+w9+Efn8iNj4HL7AoRo6XfCTpwSvrgsosqmLWIZHgkytsPV0rut?= =?us-ascii?Q?s7NbXWeMQXVf5hNaIw8c7nqbal2H9GI4KfDtDjJpkEzhmX1eVUJTfFW8aNBI?= =?us-ascii?Q?GUqCTZZDnyIPvY108qxFX9dPcEuXtIj8dAXQ/JNVq9kzHtQ9IQ/7+0LLPAyF?= =?us-ascii?Q?xdC31WaFw9XXjHk=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JL3LM/rLYir6k71QylauY6jeGU/AZ6d/0xf3KHctXLZHOwiNR3L6KOGOaMSE?= =?us-ascii?Q?LbZgnam5fEFLWaIMktEdGNZXf7cdbLgpY/Z7Rs/bPT1aXOq0EvxIno6vLooi?= =?us-ascii?Q?DhcycsftFCy4HKY+LuFLLhum9IkWEWkFeKoacZt1qLc33jD0hsxPoUqflkzD?= =?us-ascii?Q?Vn2Pu43JEfr3H1mNyuNkTwqPdniC+JJqFEpfieoqmTBX/IFWA4SRn8Y0n6j9?= =?us-ascii?Q?UfIhRgKhoJwUpOQhDTQVCFc79tT5qhDPScssmtdICCKyz0tRELPqRtsSuYp5?= =?us-ascii?Q?v2+um02la37uK9p46K2ISWhIvlCxxFB6lzCL3W1Eq8elKx60lqVIN6qofXJ4?= =?us-ascii?Q?A7ZMWFsrLdOBbohJTcPA0XfgMaeQyeBydB8qSVNxOUlYrQ+Ms0GDuxwjf6sQ?= =?us-ascii?Q?S+GM+6L2QR45mrc2i+D0pGvuNXDgN6TEmLk7G+/49uYX5A8iydvPK5Z2UFHs?= =?us-ascii?Q?nUFpV4yWTv0CSH3YzxG/GNODen0GKLIO7XyUT/2wdcNph2LoPvXvJMHXGJUB?= =?us-ascii?Q?XrT69y1aBNx0DhBOs1aUYMPgA1pjDJY1DDcdYRuVsBBlD+BkShNx074235Ll?= =?us-ascii?Q?JDaQW3esWhSFIbN3kmwE+VedM8rOfqD9F3jcc7XjWhKHfcAmaC8aE3yMVDRm?= =?us-ascii?Q?ncuv9Z/LMvpceJzoKnbEVQScOFH/6meSzcXMIo9XrbRLBMH77oZnZ7nzF6Wi?= =?us-ascii?Q?q25hkYC+/Fdnxcfr8bnuSNrlZ0LmslnpHJ1WFFgLN00yLJOWg6qFFIn9n/cf?= =?us-ascii?Q?LMYPqh4IzAHhcdvgwUWAIuaANY/Lem+KaWAv1tHWkT43wQd7aUguuhQvEgwD?= =?us-ascii?Q?ea5RKcQc9t3RQ1MtvqPpY771nnCUeYuE8ioJIvR7LuddM7afuDLPmmfrSnca?= =?us-ascii?Q?g/0mRCN5bVK+qFbpyIJMsCJTIuTQZBYBnQebW9ijQpIflxEG8H+6Pf+FGKaM?= =?us-ascii?Q?c2Mtyx5soAJLrjIrQnjU/P0LrIawEDWyNnqdEWEWM4oJVsa1ZsXOpJy5xDSN?= =?us-ascii?Q?XCTecrgmfH1VLXvRC864/HAAkDOED+p6KbRR+1DQBpUdNm3oTzNAYC0kFahg?= =?us-ascii?Q?N/Nr8SLEQ6ixYqDgbyNTN0hLCzX4xb4Fn3RoOJPWexxyYpvV1Ca32lz9fkTv?= =?us-ascii?Q?vkYpnUFT340zWDAWuIOuyJ4ME6954TynsFDP+DJ0pd5l07KTUrBC0PgicYNj?= =?us-ascii?Q?6WP03/vsoNXkeoiwsurKohVgQHo1ax/jz8NSxCm6POiVvPciibUJb0tcYS/m?= =?us-ascii?Q?wnWk/LWIaoEALBtKG4JXppnD4rfwNd+Zwc9YYqo+a9ESo84eY4iuKp1dCJY8?= =?us-ascii?Q?ZgWhbC5GbZS59IApNgMnkoIuGQs4xD+kCfO9oSWIcNWwTcHpX3sw+Xqk4zT/?= =?us-ascii?Q?k4QAtJsL7vp9L1+OIgm1gSsoY77pkSEMXLHrYFMxOfor69nsB7QmztN88iXD?= =?us-ascii?Q?HNZ9YCVciG7q4jdDqk0IkgN8fvUDz9kNZSBRehs7t03bRjuo/CFJsRY7u+vT?= =?us-ascii?Q?GOYCrPxRcuidSLfahdn91cNyFOV9aT2WkhqETLmhadgqQtgTOKUeuoLmOGTy?= =?us-ascii?Q?wzuabNHtHHJ1snZjaLRkXomGMD+aveW4iIXm8gj5?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 173cebda-b8ee-4b62-a3cf-08ddbe8f9370 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:22.1633 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: U/pNjIixpPBaTEqJy/nt3su3dujxEBKSbQulu+b00cyb+x4qgwOQfXVkS2BNsIlfvZLi5OOS21YP/Y6sjwquFw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use min()/max() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- 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; =20 /* Make a single overlapping BAR mapping */ - if (tx_bar_off < rx_bar_off) - bar_off =3D tx_bar_off; - else - bar_off =3D rx_bar_off; - - if ((tx_bar_off + tx_bar_sz) > (rx_bar_off + rx_bar_sz)) - bar_sz =3D (tx_bar_off + tx_bar_sz) - bar_off; - else - bar_sz =3D (rx_bar_off + rx_bar_sz) - bar_off; + bar_off =3D min(tx_bar_off, rx_bar_off); + + bar_sz =3D max(tx_bar_off + tx_bar_sz, + rx_bar_off + rx_bar_sz) - bar_off; =20 map_addr =3D pci_resource_start(pdev, tx_bar_no) + bar_off; vf->q_bar =3D ioremap(map_addr, bar_sz); --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from TYPPR03CU001.outbound.protection.outlook.com (mail-japaneastazon11012019.outbound.protection.outlook.com [52.101.126.19]) (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 3835E1A3A80; Wed, 9 Jul 2025 02:23:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.126.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027808; cv=fail; b=rUiFtlZAWXhSh8O12nE2hvnutCa/0Xow/Kg1obd6mZdIWNXAEe8BDkmZx60tC/08qDZfClrjvtlPejwLAOSNEforvb0MaqHRUcSv6KfOZZ4ZoENz9bboNFhVgIw2zVzmLNxYsJewd5S/g4g9RvVsUgFF/6ZRurpXW/VjUIqfBIM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027808; c=relaxed/simple; bh=uE2eBdYYU+IW6bdGmoOfI5wfrFT2T2F+pWBVc21hLCQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ZCIwJ9JwXgsN07fw2BvQMOXwK4GwaGkY1vt3t9HmNwe0G2KdpL/9kb8VItavHPZL/iYD3+MYQm1pZuQs6fxTBiz1pJt0a0BRTNMHOrYDepHJeHUEka3lLgW9YwPKp531+/d1T1ALR50U5MIdpFI1/Tbz8vK2CRx8qFIeOfjefnE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=Y//v3Z28; arc=fail smtp.client-ip=52.101.126.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="Y//v3Z28" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w5Pg7XhYbjz9Vs8o20ux5OeWoARxFelU2tuhWVfv6opUimF5sl76HWE77GB5RNFN3QTPiNN2zLbsoAiwlmqqzylLlVw4I2OIIy/XvuJdL7VWmKlheCjBVuQi/QeeetRGgnHXEd3KahebteXxDmQyg2H6Dl9qxcfkJc/WW4AdnDIw38hhs3XsBbyA7xVbvB5tefUJcO/UbBk2LXmu5KcLUnDdjdCi0uHIifTC9YTvpHAFCZ8VVL/0A1Y9aEAwCDv6+NaKhFd2SF0UC0+Tupuig6r/UACSueWw/PY8EEqeok8VZcJ0xfDFwWCtMs7FwmG8CMqGgT4RUrqfs/7wZ2WMPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BU6WcTQhxw3OEPDEYhfAHOl7AJsYf4ZLLMaKs+MaxRU=; b=a19QiJmJl7DOZG69bto5WewIPh+1goSjxp1WPCu7Oyh3kSG3/d8/xzAURXG1Y91miADZb/Zqg8mYBLHg7sKxSGiX80zznVh7b+Zh8O8C/0CzmglV0YhrVEgL6jqjUJoHBXiEVNsNOrbV4NPlvtQwiUPSOfqm0NFHEvJVtkNc3AYnpUVjEEin7qTNITDp9L1BfgZ+hxHHUHL60Kt+dL+f+/GMx/BxXBaEfZyOFtD+rt7dDxpeb3116x5Y+BRmYwd1HuEq46NE4ES5R4p1T/UfahmWvsT5ixE9F1JwiHQzADGAxafRejqV6jkktA8l5cAkx9j7J63KMZk0ULmwcc2Zgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BU6WcTQhxw3OEPDEYhfAHOl7AJsYf4ZLLMaKs+MaxRU=; b=Y//v3Z28S9at0w1+oiKO2hk91wPhO5QSlGkGSIoNJCqm1aEuZYAgzHsjHPKNR/vasW+r8fhVjVCBIezqlpyceLC/9K7jSXZUMovc+G7/98W1b9nMJYg7ZESdWoREevXR0ryzrmzT9ntEHmm00bJW1BybU3pK5+NcrUnkel08m/qsUasGz+znWSDcVf4Xnxvvyhh9N7/o+jTM3EhvI/Z6COPR+DzNnsNtuE7oDH8/0s+Zqg2sxSyQNfBlMtn470YrVRgRpEzQbwg0q2+YQBgRg63L6zfmoNlLrpS1DhVwHf6KBqHj+a/IJaUphe+XSWcWqInmiNMyD/oeZfKlQ9MBXA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:23:25 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:25 +0000 From: Qianfeng Rong To: Shahed Shaikh , Manish Chopra , GR-Linux-NIC-Dev@marvell.com (maintainer:QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER), Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org (open list:QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 05/12] ethernet: qlcnic: Use min() to improve code Date: Wed, 9 Jul 2025 10:21:33 +0800 Message-Id: <20250709022210.304030-6-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f06b6c1-1c4c-48a6-d9b4-08ddbe8f9583 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|52116014|376014|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YSqqjxGhQgcIgsaV54gxBnyHAFR4MjG5xHwZAr6ZeDbXWDRcM7jBjypHfXlQ?= =?us-ascii?Q?OfjXq2AYPtPE7Wy/8wfnvy2uNgRoE6jADjpY/E720C65isgeU+kbpOAJJIPd?= =?us-ascii?Q?Yj3XIzhqFL/g8EVchMTNdmxqn7N0/Mt3oFHW7+ypfzo8kTXJ7/Q3hYIm+/so?= =?us-ascii?Q?riSnh3/MYFbtaLz1/ErTSfDjIHsO7MAAubhlqS92CSzAdRYp/wy31dgP0G/9?= =?us-ascii?Q?y+W9irCuK953znGAdhi0Gdyk7/siS1B+pVOcB12LgCHS6ivLGvGLzbRa1CqW?= =?us-ascii?Q?2/hvvtqBdyq6sC0ChskGHXHY61uGapRGcf6FbGHO64/etuQHY8e9VkUDs2NE?= =?us-ascii?Q?GceKggcb8Gq8O/ItUedNQ+uxzUEOSaxsLzO8dp3v3DoV1I+iZ4yBTW/ZN8DD?= =?us-ascii?Q?jMleNztIQWhFYrCgmI3r6kydxqSwVfMcZUt0f7Y/Slt1qRxu/nr8Cjcy7YO8?= =?us-ascii?Q?gW6d96sngqkH2/JaZSJ1M3FtnQrXHbkyd7Pd0PCDqHpcJXQl5iWz4XbDLXrj?= =?us-ascii?Q?K3FykK40Rujk/hg+1RNnlCxIvXEdNoexxYs9SWJMUqn/VFxWPWpW3S/Yw+CM?= =?us-ascii?Q?uToGz5KgHzuygD8VLJyaCTdqAotOPg1tLHuxRpq4kTrDnSVSvptGurQmw2/8?= =?us-ascii?Q?YGsQVPbPwQJWwo/3dIMfTeYaSOsR1TYe1Nxuv5nW2g3sGozv4B3hJY9ofMuj?= =?us-ascii?Q?noI2LR2yEEEVcQAJQljYQmMaDOcEvTEF0SljtRQa1GWpsBIHeyGhfKX36xN2?= =?us-ascii?Q?gYWIJMQj9xr4L4Emgw5drb9BB+ClNTKNh8x4KqKlRw9LsiDRL+UgSmhf2+bx?= =?us-ascii?Q?wLgXA4yH1xSKmR/1auftd5JPnMFKlzVl/265bSEO8xL1Yw876ZAYTBS0o5KR?= =?us-ascii?Q?iAHDy+3VjLqdDka7Oj8NVZDL+Mt9k9/imRFpxiqZIpV7Mb97nhXurINqxmCx?= =?us-ascii?Q?zbQXlWW3Ql9DTklPtCkZdvC+QPiq1UgWCzpcJzyWPHMjxZDqj8J+nawWySdK?= =?us-ascii?Q?kLmdurlnnj+fIfrYSpA34fmZYIL8XGH/qK34t+0gk1Mv5kP2001jp+vVsYOR?= =?us-ascii?Q?UIz5O7weW0AlnXFUi2PPuLagvlUAWzLJzU9+kK6YQeI2PuQhqIusrPulECQM?= =?us-ascii?Q?LbPfBOqMZ0u2Ufr9wEw3a9jJ8hjpldQwfLJThEavIshFisPkftm8T0nmPvph?= =?us-ascii?Q?mTAnnseyg2BNkQNUVZ1PJAX2cVOoadesA8rdldl1RsCFGbv/WrvAbB/2SiLL?= =?us-ascii?Q?lhQ0H1H2jw2NrJBtVTiMpq6nMUgr026WsR2VbWVNhaiMcuCLJFRHPU/rFg/+?= =?us-ascii?Q?PzyF2xNhdQS2Q8SpTMjLMqfp5JunIUfqD8H0kJzWMltDEb0sSvrO+4vD/bit?= =?us-ascii?Q?4rqsLoulNKIuuafESl0P9vgLUI/2bY/cBgNsWss1M8kPXHXOFwD585erA8U+?= =?us-ascii?Q?LgcE/v/G5hj8HiwYUWO3+CyOyniyMTopEVUtlMJGllM/NlkgHOTce65ay3SU?= =?us-ascii?Q?yWcLaxBvT1+pIw0=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(52116014)(376014)(366016)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZeIyyqdklr1HkswdloVT+0pmgVo5pTW3/mO6zz266SVJ7weg9+xIXdWlG6Jq?= =?us-ascii?Q?a/fUSXZZBuyeviEW6ADqf46RhmyIFRCZTId5ZNH4HzSzNNpJ5OnJgVgrYZ+U?= =?us-ascii?Q?QwjqVGVLjCs9P6vlvoRuVrHpgXl43NIsFi3YSPWfF3YfdXi3ui+u/E2mEBau?= =?us-ascii?Q?jPa1aWVMCxAn5n0tEJUr5pqcLumwDNeOQ2yvCuRhpGRldwKloz3uTnFjeoj3?= =?us-ascii?Q?5DdPrJkz8e6C3URxWqPB3kjObNSG4pxkNf6oO84x113xFoO/ubKtpmpZy81l?= =?us-ascii?Q?t9z77tHkrGCBV5WCOVPp2C8Kg8AQhaYfbGKQ9nQ6dHMc6rFnaLQFGht4QM2A?= =?us-ascii?Q?AvtzfC6K9n0t2TsMCqBVHuO5vGMohO6XB/5GSLUqKTG8YC/tV+JDPd5DMAgc?= =?us-ascii?Q?4mz4YXpsnLu9vdal23fzgYLZ4U9jdVGKXOFLze5R8VchjpAH4lrM/ckLJJ4l?= =?us-ascii?Q?SMV6ZXcCoLpJw2enF076MjgfKsrd8R1SrA5tRS5Kg3CRt6sA/hx4r5O26sWA?= =?us-ascii?Q?RKhHVYMVlvfl40xcR0zMc98WDLZ1CxasjcL2Q39Zt5S5UcZ4l6NYM6vN86BZ?= =?us-ascii?Q?NNqoD84cybRhkfR6wOOaxo6sXusy3tr5GR895RF6i5rMRBqR5Rb+MGPykBwi?= =?us-ascii?Q?09zMWSKCgjLFEXgn46812iMSEUh1xLvzVK/VPLCshyoKhPJqr9voYER22pq1?= =?us-ascii?Q?bH5EswwP6EuLPSBQNzHBMTa9jg0okRCNcxGlNTsnP/Fba2Jv7K9JQn9qQHb6?= =?us-ascii?Q?5L+6qy8kitj4KSMgIZndkwPV6yhvYP68kqAe2dqODsmtsURI8W20kFNQQhgG?= =?us-ascii?Q?hdddHykKc12+CcjbtLDTkuZYvHGZppmpBa2mpe4EgQBVpny2OsXGpSV3iwXV?= =?us-ascii?Q?SrdchKN/R+zjoJa9Zv1k005fa7ydRGeTlsne2IxD49LPYPNvB1S3xWZf1dFz?= =?us-ascii?Q?vbCUo9CHn7isgKBrj+5od6jLBOrOmu/EU6HgI2aPIDYduR4H132FW2vzniQl?= =?us-ascii?Q?FjAjYRX2OudwG3AWBDIgruH3+n4pTncaELSR8zAmJV4sFGGyZ3VdYiPl2nad?= =?us-ascii?Q?S69ZgY9NNCRpJ7OBFXMid5otvsYMEmvkTAKc5X2bGTKk5DcddHDAgYeB9QLH?= =?us-ascii?Q?j+OvhI+Ofur9fu2IDlztXZdSKYtA2nQnuldYorscxCdDv/jjAn7P3F+bFTLG?= =?us-ascii?Q?gIHIpxgvFtt5Ioo/Mkfs3mhQalBeq6z6BDVpsWzCRZYR9+nwc2p5YKahtpr+?= =?us-ascii?Q?w9KqdgRW/QqEGuqHkfDtAofbGd7fovQReOAbeZp+LOI0AUq7RwC6qT07LC58?= =?us-ascii?Q?Mn5PKH2EcmTrMzm4CxWc0p2Bloieg8h8lHY5QIxL2kmTG60JKhhX0fYY6w9J?= =?us-ascii?Q?Ozs2TGjClMqLJbjQUEniRRNTuk9Gewudxzd27ZBSwooKpy399HlA+cn9iA2g?= =?us-ascii?Q?GGlNNEmwW/MWeqfbjI11gMzfvc/W4w8y9mxljeZEp43G9Jzuc71RYxJMy2rx?= =?us-ascii?Q?IzIaM6xPSVMs0+l3W4F4MWsk+QIH6tidYqhx6pwHcSS2G7NjiOfG3O1cFzgp?= =?us-ascii?Q?2ec5y71HHdlxkLTYoG7Kv98kf6IX4QMfHCEvJ5Le?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f06b6c1-1c4c-48a6-d9b4-08ddbe8f9583 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:25.6419 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VY1Hryjy6yo+d3ByMP7iN1dQw92z5CNi/CFhsTPWMVN/QxKQBAS9aSFbfc9gUO2fTXTsvuAOADVEk4h5TR9R0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use min() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/= net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index d7cdea8f604d..c273a2716786 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c @@ -1181,10 +1181,7 @@ int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter = *adapter) struct qlcnic_hardware_context *ahw =3D adapter->ahw; num_rds =3D adapter->max_rds_rings; =20 - if (adapter->drv_sds_rings <=3D QLCNIC_MAX_SDS_RINGS) - num_sds =3D adapter->drv_sds_rings; - else - num_sds =3D QLCNIC_MAX_SDS_RINGS; + num_sds =3D min(adapter->drv_sds_rings, QLCNIC_MAX_SDS_RINGS); =20 sds_mbx_size =3D sizeof(struct qlcnic_sds_mbx); rds_mbx_size =3D sizeof(struct qlcnic_rds_mbx); --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from OS8PR02CU002.outbound.protection.outlook.com (mail-japanwestazon11012021.outbound.protection.outlook.com [40.107.75.21]) (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 559FA1A23A0; Wed, 9 Jul 2025 02:23:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.75.21 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027815; cv=fail; b=smSQlrzvVElZT1ZojCV3AxcnaD1DIzR3u4pQ74pc4eEdTVla88TLj/W2bzxflvcgWSbTxnloi94p7c7uuaibgkg83l3avscLYTkEuOOY8nFvozevIhqDyoAz6uHStMHRJfhmgow2P6zYTK1xf7mwCFAE1tw1eYLLat8pl3HsDQg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027815; c=relaxed/simple; bh=uWCYp00kqkPIL2OhSzrl1x+MQmWQLv3amJ7F/i16mSU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=YzKfXvORJp+gdKDmYQ0FVwGdSee1qINaWZd3K5RrIdM1F2Ojr+9b+OrcPxfj/7eRkvXbFk/wJjybPeh48ds4lAiTACsP5mfYx6NJYBS+7gVbQVN/me8L7vc/Tve/ko2FI43gCUY0b8Rjy+Z6Ci4D0/BbnWCO4/9msERq7H3vHhk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=HoXkhUfJ; arc=fail smtp.client-ip=40.107.75.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="HoXkhUfJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JmfG0mcou4anuBc2ppzbVS9fZqKv45Do/ghTrK6u+bvJ99yoF2tE97ut4x41tob8FuzirRas0nOLEc/Rpq5vBImlD+qa7svm0G+RbkplJOjuXRhl+FqSy7M38jCjC6sNJd7rFDJe9O6o+dZ8YNhbClrBFTrtfXO4yfmIbs5i2IvJz8RtPaVNEzvHS+dg6fnyrKd/HFfJJ7S79EiPNuNYwiy0IN9pvfxScDf2pxGBjqaXzs9xM+Y/qTTAAKPdkHWSlBKbW7RHpikbOAC2RTCVUy/X9k2syoKu7R6WFMwRq3uiDIzyk9qw9p/onIVFNO1NOb4rfpJYJQEYdjzaq4SmZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=75/ZZI17eCJmeascglv2wdbld7FMsi05h5Fi3PdpV90=; b=kWr/nUFiBpmqnrJP2kOA99CVknfQgIOPItc1eJ8mL73U41rvvzHehlzIruu3O64wZykPy7YQ5Qj9zU1ZrtT/g4q0mZKrhH5GxwtpsdMFtAurmJVq0gAHr/Nl6kJlMqWSEPcfhJzUUsU5ak/sG4qgV2zt9dgXdH1LdjZIRuAFbaa5ISocam8kumInhmtz2XXgvR0xZ1z9qpu/y/iC62DLq7inQWlwI2d63N8/ztD26vAZZ99jrbso4Di+/Z5rD0m3u5us+he6jMCsbBYwhYxS/JGxLOQZB/Q31DT4aX8EXgxK2fzRU7uW2Lu7Xw+x8FJe+8CA9j4OGIqiODK0rz82GA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=75/ZZI17eCJmeascglv2wdbld7FMsi05h5Fi3PdpV90=; b=HoXkhUfJU++8QlRWbmknNMB7e7a6dTnEyK6NP8p9PU/421Wk6NruxHuQwVJq1qD8uv9yPf5Wagb6fbVF9vLeZkBiw3guCgig7GEskt2rAOnhhy0tNCaUYKER4dYG1GVkJpi9g1BeIjy3dC1MsqzjcjE3Lq/NGf8YdFmJUBE+k/SQ+wnmXsQRIQc5VsmXa+T1IUzYjkadsGUu2g+zz78hXkeeWSJOxO5MKGCA+UFksn9i/+IyuicnSSC57Mnmk5Dl2+nsew6SH1U2WMli5Kp4gsT5ZzSIjRyDZB85gpy0exAtgj4Ex8xqnW9po5+H1HHviNDfg1I+wSbvBBxhliQlOA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:23:31 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:31 +0000 From: Qianfeng Rong To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Kees Cook , "Gustavo A. R. Silva" , Subbaraya Sundeep , Aleksander Jan Bajkowski , Eric Biggers , Qianfeng Rong , Lucas Sanchez Sagrado , Hayes Wang , Philipp Hahn , linux-usb@vger.kernel.org (open list:USB NETWORKING DRIVERS), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 06/12] net: usb: Use min() to improve code Date: Wed, 9 Jul 2025 10:21:34 +0800 Message-Id: <20250709022210.304030-7-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: d0a41971-00f8-476f-565a-08ddbe8f9919 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|52116014|376014|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ovkZIrM9LzULA+Nr5Qm3+QaJp+jSl3MpsE9ezk1wvvkgnK9hdgmN0DE/20B9?= =?us-ascii?Q?n3XduZjE/cvmMzhDPSIfhRLdvk2k5RFRWjIbUt2wPp/0ehuuJCtV5ND3rR/F?= =?us-ascii?Q?ajOATo8Aw4cUyMaVuquiGIlN1qac+FRCacAJr6NxRa6BJogu1OL+YYcuZeO0?= =?us-ascii?Q?9UsFaqVsQByH0L5KIea7Zv3ccl8ivth8KeMhs6pCfjvmxR6MzwIYcXKg+2Js?= =?us-ascii?Q?EYMdPmSbbBJRIol3jQQuQV2aiEEwYgD7LyE9m4kR8QVpEb+/Ac4V+NedpRl3?= =?us-ascii?Q?j+TsSeNbyNmLTj7EMzkqDOYE0LbQkD2ZbJXVJY4PNUQdgH9zQnxUcI588+tg?= =?us-ascii?Q?JSFwSpz45Y0WUwRD44yX+s9aSJj12AtkgWsyE8fSbMH2RdRtj43SmlqoMdgu?= =?us-ascii?Q?eZKEBKbx6e13hN4TYx5L3sBfvww+qL7dbKmIYVTl5/hHT7kgVC6tdyqiWxHf?= =?us-ascii?Q?A0HLRbTlxGJPh9vr47DJa42KTVlDXKmvFkQwhsk+qipaJl9PgjZE4aj3+DVD?= =?us-ascii?Q?thLNdvI+oEOvcEcpCa9ks2cU7hZac/o6HgrbalJUT+yF3VUQl8PmCuAsr8V5?= =?us-ascii?Q?oj9ay1kDDbMWBuSD7MmmNaE6Z/tWE7QgZXd+2EsB9G1h2Ku6MC9HborgA3HW?= =?us-ascii?Q?mL9vUcpMhznHc6xteHCPfHaf5HGHg40KDYHDtNH3LrCWKXpx51vc1D57tZ0P?= =?us-ascii?Q?z2iQgR+t29GjzYwdUJLSmckBWjuKuKd+mVc0fLTpNws9F2kKdhinnzvUTKEj?= =?us-ascii?Q?cwHwBMjM2anehbcDUqfceezBGAWQLSp4oVJ8W+C67x2FpHzGcGbd8/dUQ1H7?= =?us-ascii?Q?1cVmvwZhU/gM8KWieHVicv/NDzHEMdGfi8N4s75vO8nZNAiwFIJI/gLgeIDF?= =?us-ascii?Q?KMY4zul7aE/H/uYIqEnci4QABauuPWwZMg0OfWrdas6kZ/QJ8Z0u4sq5xAV9?= =?us-ascii?Q?Z/gChijjkXya5j93vF0Xc4lxkr2SQJsruUDWYWdGeLCjTvC/zJ/LT3H0LFGi?= =?us-ascii?Q?CzxuMBMDUlTYqB3wh23YhEoLBeghKoVar6sDUwNxpEq898EP4EXdu8bL+7vL?= =?us-ascii?Q?2yyQ+fRUGxFzH+ai/atHfqT/vrLvbs8Pq6xve5LYsh3vhTiQoTW/lxrm93xv?= =?us-ascii?Q?Gx8yISiDBJSULAZbsniYDfhfFiVKKDlpVSektv4dT9BFySdu83d2f/k+IDuu?= =?us-ascii?Q?L28LjEgRaLZDoOmVycP6ZDR8DdjaUDiAG+BMJdUkSIC7VnMAsM/EfQZFtcp3?= =?us-ascii?Q?bvb/v8uU26NKr1/VIsbhf8xFVKh6z3IwYnf+C06LX1YT09/ZWyLX06oYq1ms?= =?us-ascii?Q?uDyhuWf9I6faLKGkiYanjaF0pOaDrUyI3nvPJA6y2rnmd1JdbWXwsbea4GgO?= =?us-ascii?Q?/N8W5I7vCOhnZ2+6MdpUvFHYBvDXfLF8iGTJYqHXWJigs9hKyNjZGpQ3KMVc?= =?us-ascii?Q?gZwwnJWfSkgPYhxUPjbbIXkFto0aKmG+GaU7hd3ukoUF8eFW1Mof0TPwU9pU?= =?us-ascii?Q?KAaLHEt5Rn05yy4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(52116014)(376014)(366016)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9znEPf05x+SEkuYuEuTOWul//6eWVnAwwxhALrsPfw9kwtEjhA4USC2IR+lK?= =?us-ascii?Q?MkQoSoGqfs+4a9UjZyeGlUDYarQcFddff9RrWmWbKpCX00EHhtouVJaufzRW?= =?us-ascii?Q?l+FAWjmwMMIe3uPynJIhWh/6Tc6htW27eHE6GN9AIABLQlp9UZ3Gc/SIEZ9D?= =?us-ascii?Q?/L1BNw5KS+fLJ5EMIEndw4Cy+TSD6Ple7IClX+5r0hHX1P1OpSKnx2WONZWK?= =?us-ascii?Q?nSHuwpZY0WQp2T1uAxs/SmWmwrEjzsV+XFTJlHOIJXUR3o+zo/XCO8zHmZAZ?= =?us-ascii?Q?k858rnulYX2OWlSEnDiixzwM9NNPHuva4NltmMNEsZJd62knO1rlAqjEyAy4?= =?us-ascii?Q?D6ic4XMwc1qfri2AZvcOdRfD1OfpkEvh4D9N7ef1rbNKXmLGaZaqHnd8ct5z?= =?us-ascii?Q?Zi3OAgTojRPG42ZB410/j0XknefRb+VGS+Vs0lr4dAv4+A0E/UBWHxjDEHjd?= =?us-ascii?Q?jfzwXn4M3f4iY2E0CGxsmzfSdsAw8W0b1cxF40SfFO6a7gE5X/eCB20eu0hC?= =?us-ascii?Q?If8bFvyC9hUzJ/MJvyPiAJQrISWDHr0EykktVS0tJhEelNmOH4C8IsCnXVeT?= =?us-ascii?Q?Aq7k+x5G/WbMaeTtQvMRV482m6RSbfa0YIVs69GL6GDWp/AsZlDG1IXc664P?= =?us-ascii?Q?pHtIccFdwFVmDaGG+nWke6UXnYnobNOEarpe0f57WJnEnjUndSi5XrBSMj9K?= =?us-ascii?Q?S5+gWxVm1QcJYxwBKeTTNomhaekCRvL2gSKPVMWzJdwKExhuNhieTpDckXit?= =?us-ascii?Q?iMbc/2ZwOEET4JoWKh0dSgSKrDt4RO9NfLIynWcQCzUMHedMdveJPjfJrtsJ?= =?us-ascii?Q?mFxEnyVuMLCrDGhVH3sq3pi9gSRSAE7qQY/0NjcT7FM/By/PKQmvVpifxIvo?= =?us-ascii?Q?IyCBNzdEQa92tvMDX1ERnCrQ40yxZCSQ4s6O9UqzfFVwMgggp6gn9Sip5M+h?= =?us-ascii?Q?PLZlKx9bV7ESLxfljCocZVJI7KbU9Kc78xcncziptOLpC5as4sjHvvIv3Vus?= =?us-ascii?Q?niLEG00rySydOhE9bww1vxCjfsGJI6/+R7nHEcAO3oyTtwZBLX2prHT686tr?= =?us-ascii?Q?OCscl08c/xuhNJ3krV6CspWOzl+WtD6/5DhTxAlGmelAkLV3htkXnSzEdqBC?= =?us-ascii?Q?iPSgTC65JwGpbmih1yZuC+/2gyUxKy/L+Tb5zn4DNFDILptXnU0Zk/lC5NWa?= =?us-ascii?Q?orfwQiay76/VhWcGYBvtb2YoN1EwDGVa2udi4wcVZPTlk0ODGXC8+Zy2/IGT?= =?us-ascii?Q?XzUjIB0xC+j76NCO/y876VQXvOLg3Wfw7BbC7FWUN2E5NXqvO0xVPKiKs+Kd?= =?us-ascii?Q?FX2vq83j++eQX3PZ5hDJsb1z+2bkHdbtDo/P04/hXwYqVHOHJJYmpjXgSQ5w?= =?us-ascii?Q?wLRdE3HHrqv+wlBZF7UV3WseWJYYAAA2GXY98+QBXwBhHPgMwrKKuiegRR+8?= =?us-ascii?Q?UvMLgoRXcst5fjz/XGer2Z2CfReNWJsCi6+3mXcEYDfhfPKJB1aabWzFT6QA?= =?us-ascii?Q?Ju/iS3UiJLP3rxLEyUydQHhVQ/7ifgiW2JnwYFTKJqoEoyjNpkuq/h4/gFmS?= =?us-ascii?Q?w4LZ1nasRU018g8zh1wNiTCuxF4+XBSEnFCLaFCt?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0a41971-00f8-476f-565a-08ddbe8f9919 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:31.7393 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: D5FcgEV7zM7bWyYVh6+LYjRNeTFNF+v+aCf84OQ9RrsRT7lfUXPVrqIElxTDvop/JYG2oHQegE/2lGxkEnvtrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use min() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/net/usb/r8152.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 44cba7acfe7d..c81a43da914a 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4949,10 +4949,7 @@ static void rtl_ram_code_speed_up(struct r8152 *tp, = struct fw_phy_speed_up *phy, u32 ocp_data, size; int i; =20 - if (len < 2048) - size =3D len; - else - size =3D 2048; + size =3D min(len, 2048); =20 ocp_data =3D ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL); ocp_data |=3D GPHY_PATCH_DONE | BACKUP_RESTRORE; --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from TYDPR03CU002.outbound.protection.outlook.com (mail-japaneastazon11013025.outbound.protection.outlook.com [52.101.127.25]) (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 4A1051DDC37; Wed, 9 Jul 2025 02:23:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.127.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027820; cv=fail; b=H+pZtqOLH0kwlK2L9Vt9wwHGXYPfArV2rRnnXR6M/JOgMHahRA4c8AUyVrGRD8Ujhf20Jrser8VwQCWiKMwC9sLnmGIJO8zKcH2BAY6jcCgf9rD0Ct0w3zYtaQF0G92bn/BPO+ouTfI3JIS6aiHNiXnhNDi43iJoD5Mhoj5mAqk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027820; c=relaxed/simple; bh=DliABYwYy+70GA307FstFlVRKa9nWy5ISDaqrZVU5W4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=i61lDG4ZPfGc5o1aD7VdIs+rK6+AXO7HlRkFMmm/rm3PYFIChqYayNtbV8EWvw5q7H2rxWKLPr/oEt3yItszEJmI/h9ShZobwJdd0LO1EuCV5yPUgleiTA/XlcxNA9Uc123ZTWP45iLth5jaitXaBRnIi6tHM5FNVW4G03+CiFc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=aAvNoRjH; arc=fail smtp.client-ip=52.101.127.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="aAvNoRjH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G0/YfERQuCFIM7xz502QA2Qk6tUyJ+UVRmwym32z832o3t0xg6ko5X+ujM1u25MnrjqhORnDZ1S+8Q5Ty1OJ60CzmN/WjmAyvhlqg4Xx4VueAPc52MWHa8cd7QKldpYD5yG6TZRaHQXa79I/bwsbjpfubpzwvXRCSPUFjx5RanyE0hPX6FlQh1GVuri32os5W5MGko8uCvz8H1wKfXBJVSRUwrX4nLUNhdpbK5wM5xGfiJ+NZX+BKQzjRwuoC2M8P+Ds1LrhdewTEYJo+6yoOeo3QFiLXd77yk0NEfIA6BLUvgaEl7kXGFvHVzVH7ojxR1Jy0wCG+3HQpEnY1nVZ0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gJdZO5qCMTv3wKdzBx3BoVLkV0j8J9mvg08emzCGc4Q=; b=bCkTsVXKuL8+GhEHGA8T8L8Hwd1DV+ZiawzrXTDXifFgcsyKAXmoFactfkRVQ9yXpCKIfRwPjEj/GKnmXHuIrhN/xPpN7oBozOGgm7NKa8ZSVOgBzX4ijpELw0QXblVvQeufnbauzRdqjbgH0qx+3p5LKMT8a3K9L8P6jwxZ6R1D6UIrkzl+2k+XzJLyZ9RHJVpoitSZkq3Dd5M4wtvkgSHwwSFHJfwi2+kJoedKvxI+eMWLJpf4jFLERBHFt/0fql/vZn9VZtF2X3Up6CI5ZILv9in0yog5oT7b/61hhhCCBLFI/gDCzhhbYG2hKwAcz7yzarnRfCyMjgrjRPQhTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gJdZO5qCMTv3wKdzBx3BoVLkV0j8J9mvg08emzCGc4Q=; b=aAvNoRjH7m+3aX3F/kympsEmnuGceS+4w5PrxgA4fmbDulk9gezhLx0y2P6z6xwkMyoI/89qwED+NYF3xA4IGI2NE4VCnXhfAFrRx18y8VPAMNIQrS6nIbt/xTPkZMDZOVo5NMOj8RWaZT9ehffuuG+c3e6qN6VNRR8T0s8fCq4gWqAuu2adxK3ytCv1lJsmZR7KFDut2wjbZoH6dzkPJzHkH9UIRUor769CvcQhDVEmr/kkAuH2FeHuJcfk18uR9E4TUgKnrvGmkXb0tanYOmeEyAcTTe+Gn/VADIOoA3+qu+R5m8lEKPa4rCxqUVvKDhcTULjQQ4ZDE5qiaTGt9Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by TY2PPF4597475D5.apcprd06.prod.outlook.com (2603:1096:408::78b) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 02:23:34 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:34 +0000 From: Qianfeng Rong To: Jiri Slaby , Nick Kossifidis , Luis Chamberlain , linux-wireless@vger.kernel.org (open list:ATHEROS ATH5K WIRELESS DRIVER), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 07/12] wifi: ath5k: Use max() to improve code Date: Wed, 9 Jul 2025 10:21:35 +0800 Message-Id: <20250709022210.304030-8-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|TY2PPF4597475D5:EE_ X-MS-Office365-Filtering-Correlation-Id: 871d02c3-e72b-419f-487d-08ddbe8f9a8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?FWWpW62/ffyROFGX2+hs31bHe3JCBE/K2DUJjre0wIProHnK0DngNii5hYUL?= =?us-ascii?Q?NEbRMCNiSUQLw8CYHHioxFs/UO3bFtlQs+VNMmGUty+bn5mUoH1OUR7ftYhd?= =?us-ascii?Q?LbH8PoOI+eKSDkcR+XUdgOWK+sjiMt8yvC6mvX9reWnAfcJKCVazGtCZtTnL?= =?us-ascii?Q?7RUs/9z46PmZDiUtYHfqPj8GZW3NsEkXZqsUrT2mzbFXawywp+H8/qW9GhIw?= =?us-ascii?Q?vQnzeZu7n1gG3YIfxMWN15yzg2FGC+gTN9gzcqBOOB6Olf2x+mOLYdTbgUm5?= =?us-ascii?Q?Om75ve1U7VdN3wB3tg4wE7C82UnixNO/Kt8uBIhlwV89+G5Qb/Ll5y+4ON8r?= =?us-ascii?Q?uQkKnApUVEgiOH+pEBJpxuBo09dIzNYIW2oa9iN5mBeosMcFAQLpdaq4fLJK?= =?us-ascii?Q?DtjPVS/NjWZTG7ByKuz9EjlW7qfR02ilNHHC/+WP7elPGq661xyz4LJFtNdM?= =?us-ascii?Q?VRYEVzvcaG9LGDYXk+ETP9SPnd1QCNVSagLLHp3UuHfkkAoM+kIqCBt9R+FM?= =?us-ascii?Q?IvddVHCX6Zbc0ElG83HcTAbFbMpeToBkTb1qtWkTf3SCNwxboANMiScyVXbe?= =?us-ascii?Q?ZIn/wpxMJpngTemXBDQ1ZRqwvc23Jy/O572iv+L4IEPIK/GDtkiunautXY/s?= =?us-ascii?Q?mZLFTIXZn7+krPuzi/yc9ItPeJ/UHT9+/RPeQMBqtOJ8EOPMOalA81cFxtMR?= =?us-ascii?Q?N+Dme5gzlz3fL3RM5ac4y5lUit192Di1kY4r88KW/azcs1MMP9TCp5A5viss?= =?us-ascii?Q?G5xZxonGaJ5MWZhjPtEohWcl8oOuAREjHlOwhPgpu0+TzEm+/7nLJpE94Czn?= =?us-ascii?Q?fn44zSyB+TBTRH3lKDJP1aA+lcYwlHr1JMRMKJZOhE+uE7AvLjpMjW6W94CK?= =?us-ascii?Q?KexMrSXZXAGIKIXcsBnIqe2WbLSyRCRNGThYe//hl5B32IgiAHV1FTRwVy0L?= =?us-ascii?Q?+TOd4vJpyT0FanwvX9YEmdXTIACc9m9pLOr0QCPIoa5t6ZdmePVQr7C6E8rY?= =?us-ascii?Q?r8TPT/G9Sq4DQHGkzng1bjzoEy2HlNrf1drX1fIGmXhr7MxdUCY32j2+V2ue?= =?us-ascii?Q?kYVBXQ+0Wq7xovzHwZAmSFOJUleEVCRI+mbNaHHb1uFEqxTE72Vsmy+jv8vl?= =?us-ascii?Q?DkUy0WApYEGN01COHq3b8QB8S3rchkw9X/PAhxflVLq0biSv5NeT2ez1jsgT?= =?us-ascii?Q?TxMvzYd5AxChMmp0JzDbeEAHXxl1V+btlcvSC6syuW7qevYmEq1mBgm9BVzL?= =?us-ascii?Q?9MDXr1I0LokEe7dy2Fuh/Hb0srJXXcF1/q9rCws7Jtik/paTmC3ZKVck7W//?= =?us-ascii?Q?R6jlkmoti7HRJuYoAXf3ZD1DqEkWM6unPUbzk5xIG5BazFYsGtbXX8VStukO?= =?us-ascii?Q?JMT2UbxJxhx397uxJGFbsRLdxhNeEHVHYy/zewjWobGrawbE/eEEsZ2plDlT?= =?us-ascii?Q?3f3CN9JRAB88YLnW9mMD58WXKMa1q0HIFb2EAJq7ZmpDzZ80cvnepg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SQWLZjbjVNbj5xGW+CwvDoSbN25Yfu+hUbbR/K0ulM0fB1ftPSMjV9qXCoia?= =?us-ascii?Q?HbSJVQ+U7+6fRWNrgoxy9pVL/r7OyBWrpj9L0Z4WK5q648bx0VMsTM+zZ4uu?= =?us-ascii?Q?s/yIPtIgGTpzWJ1UbdtL3zQW6kh1wE9fKdIgKYe+I2xF+E6hMhbctb119+P6?= =?us-ascii?Q?qAIYJA+ogTW/6eyZ7/+MC0gMHI+dVflIU9ArbGLj8AsB1/HyCu3QERuHTgFr?= =?us-ascii?Q?zEfFk5JN/Tb0FbT7pVxVAU9qWH/aZ8nlkiBWJgIe4DlR5wFaP1wmZ8vi8Kv6?= =?us-ascii?Q?JKnIJLD2eO9WFgCeBgufxyrhml8G2lSbSIm/cj52gNlsQLo/o6CjFUavkf8h?= =?us-ascii?Q?gtMEEHyrcaTld8+8LOImpuICGruy0AjSXrG2yZsVnjz7iDR6eAYhJLCg2i6r?= =?us-ascii?Q?JPR/BBBrXywnK83jGda6xm0sjwqL1HJA03+RUs6d8Qis35uUGTf3MRfa8avN?= =?us-ascii?Q?jFC5UNo4w1VNu9ln4PXtoiUR/rzel+RQ8PAVxjl6fAKsjb0NWNoWbN2IWa5J?= =?us-ascii?Q?ggGS9Y0LkRRa00O0RBtM4+yAqnB/1H5ctu7Ybj4eL/SS7odCl6P5VSIAF/K9?= =?us-ascii?Q?qyROges71BIUPrsdPn0ijCg7gcQDGViZhjFZ/yx1Yl7mPKsZZXd604OlOrR8?= =?us-ascii?Q?rmuqW3Z4i8/gpr0HfHXKp05qmMWXPqtVJemDxQEp8SH2NBERYy1jQg714HPo?= =?us-ascii?Q?+jC0opNtEzAL5tnYDrGW7in1eN/x1+f7NRSdtVfn8pb/lOtDEkj9CR52obEF?= =?us-ascii?Q?pQS0YgHyrHWd/MaCZYvlEMjxWppKe5ZXMtcf6PpMJYso8C+y+u+b4SIPwX7Q?= =?us-ascii?Q?LSIK5K5R8NyObK1cnv3UydKEXAXCoR07NEK00WB+XhQfUcXNOApWzP0vTgxJ?= =?us-ascii?Q?8pJ1aQuSLgeZ7xgpU1HUoHMISFdJ6B+kbIxT2rYo+LmgvZvAxvwFbPXCvPYO?= =?us-ascii?Q?aWSObzjJfI/xErWmj8h7J2cUlhVtazAIBObhNmNcIutoDLLcSx2vrOKveOy4?= =?us-ascii?Q?moVPxCIdAOcfCsE37u73WEZ+gwmcXAbCAg1E5IpJ3gVK2j8Rl1ybCwu/Ieiw?= =?us-ascii?Q?DcJqPP0iuL4CM0EOYbz9TzIw7G+YJz6MIepzuvePmW6mzUNT4QKpeU/qHkgo?= =?us-ascii?Q?c/31GzsBPcuqh2Caf/TFXlaUpxdfyItJojJgFSCwyIYGVtDcE/WsU7+tI6ne?= =?us-ascii?Q?dUXLmPCv49uIF1srfB//NoVn/QCIr9DDR6F9ABFTjf71t9yB4jXbfnXZOwJP?= =?us-ascii?Q?pzQXydfYy5UtHxkbIanAqQYIY/CBHsj3+FYAIN7S5oYV00S3r2cl/kAn43wY?= =?us-ascii?Q?kAAqyT8r5bppWiInVkhyuOjh0nOZz75I1SipidL2BzYWQ3EkbWNb3jBA7Rsy?= =?us-ascii?Q?/9c7c2nQq+LedKp+NI6NYS/BHflPi4FjKe6Y1j05kyXdTnXOoyulUmogfYTZ?= =?us-ascii?Q?K0dylSGaGpBAY1l4Djqbj5uvjDsJI9mL7uCqqKMoZcTJ2B9KkcmfB38WUxQM?= =?us-ascii?Q?54QvGMUlqnC42TBtQDotbtM0IHbn4mTnf3mrXjWuICbAQSUiBa73MdHVHrar?= =?us-ascii?Q?BbAsiG2oDBJfGcQ9yL15l+SqmGuTBAjcPtWT164i?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 871d02c3-e72b-419f-487d-08ddbe8f9a8a X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:34.1074 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KwTv8ZukNGoMWTUx2iCSmC71s8nWW2RhumikExEzUxbOEZouwzVi48z4uT5yTLPZkQmFGXS4+8psvP8GcMCmWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PPF4597475D5 Content-Type: text/plain; charset="utf-8" Use max() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong Reviewed-by: Jiri Slaby --- drivers/net/wireless/ath/ath5k/phy.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/at= h/ath5k/phy.c index 4825f9cb9cb8..b76772396590 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c @@ -3116,10 +3116,7 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *a= h, pd_gain_overlap; =20 /* Force each power step to be at least 0.5 dB */ - if ((pdadc_tmp[1] - pdadc_tmp[0]) > 1) - pwr_step =3D pdadc_tmp[1] - pdadc_tmp[0]; - else - pwr_step =3D 1; + pwr_step =3D max(pdadc_tmp[1] - pdadc_tmp[0], 1); =20 /* If pdadc_0 is negative, we need to extrapolate * below this pdgain by a number of pwr_steps */ @@ -3144,11 +3141,8 @@ ath5k_combine_pwr_to_pdadc_curves(struct ath5k_hw *a= h, continue; =20 /* Force each power step to be at least 0.5 dB */ - if ((pdadc_tmp[table_size - 1] - pdadc_tmp[table_size - 2]) > 1) - pwr_step =3D pdadc_tmp[table_size - 1] - - pdadc_tmp[table_size - 2]; - else - pwr_step =3D 1; + pwr_step =3D max(pdadc_tmp[table_size - 1] - + pdadc_tmp[table_size - 2], 1); =20 /* Extrapolate above */ while ((pdadc_0 < (s16) pdadc_n) && --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from TYDPR03CU002.outbound.protection.outlook.com (mail-japaneastazon11013025.outbound.protection.outlook.com [52.101.127.25]) (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 05DB72080C8; Wed, 9 Jul 2025 02:23:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.127.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027822; cv=fail; b=ors+9J/P8Tetf15u1lAQ8d1TB9WTOZsZFPMe6SzuNI5RCsgl1bUqtrQ9K2O8uA1qkC/p6SS7oVyjxk3z2c9tLF2rQT33CPDMH72zCHsMHNHERpsMel5KEkwnAWRUM26M8H8re7dXmrqSF2CZ1V1TN9zLbYfQx+br+a/24fdZY14= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027822; c=relaxed/simple; bh=0tL7CwnBoCVU+7464oVQ5q6AYRdbHetE4vFeZgMU+KA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=QMHVKn+oHfmA1ZEz+//A2zIqv/qRlmk4sKxm2QQ4AnpEsirWfm6HYz15FY+bWiW5pY1LJ6hXX1PXEjxdhmfDItFwxmv6m9CopvJp/nKO/0VIcL33gDwTEqG/LH3EOPcynpCuwDxtxBDuuUCc9aa21cSf44vjbDbLcXgEvBnMwus= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=eR6xr421; arc=fail smtp.client-ip=52.101.127.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="eR6xr421" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a/kBDbrOhRCd3TOEYaqUbKj0ysyuON9ASO01djy0YucJ88N3WzbT0b0GTPCi+MczpB68refDmuklNUPmhP09gdJzp61+ppaP25+3VmteFCdlKCdndlzWQv3RFTfRknkjpCq6eSvVbiGAjoQgDrSxTvx+vaNykhGqFdJ8xie8fNHT/FbS2OZaz0IfSdWYddamJap5ZASm3DZUbqjCWCNqZzCRsx0nv/bQEGbQYbnoqzj9wX0P4FRgY+p44fbTt71LjHxAnCWxNyu17odTNxqpmjASoSQo74jO6JTuL0c/swmJ9c8nKF2bJ5PFvs9iGE160sBZPhpenyyuQdRmJuRlbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EXPTVUYjR3F3aOhIywWlT2woittUXY5OWpjbgXLAWiA=; b=T4cB/tu0jXnITFBuZ0GKk3USXb/1+qZ+HN25ltB5k3C1JEMK7QOEN6i9fdH/zsOHv03ljPNHop2OuxWRBNowTtReLcnZfa3S0wR2fujKWUCDL+aAWMPgvLmwRWH4tgfzP0BB+XGQBfvddImolQpNUX9sfNCGVLZxYw4RpqK1nnYYsR6LX/4Lrl3zwo1/SalfiXqqc/7zl4lx1atSgEJg7RyX8Z2CWs24St0gFaqT4/Os5iAmL7SRc7BeCWNb+qRkAyBZ5g8AWC7QUSJcU0Wc0Dn6ig1qFn2vUlsp3MHtWxTgLJNfFHmt6LMN2cWXF5phlqj5X4kqTHNWr4Y8PfcERA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EXPTVUYjR3F3aOhIywWlT2woittUXY5OWpjbgXLAWiA=; b=eR6xr421HaXGEskFHvPUrWc6Xj+02Acy6HCgU6ChOhuy52KtCVPxZlcJizxj/II29EHv0rJPGqhXEQmVPlRfBEIW3n41OeqZxuL1qqYqAWjrutXjykjUHOpzqmomRPSbZ47uyTzushbfgIFE+/69s7rfKfoPkGq2oq2As8OlWADO8ASQeVVxBnZDmOFwpg9Qn6hI8upYMRKjyYAKB75jVnAsmarKclql+01VLtHjWM5Ht5yX0twZOsVIH8fyEa1+FB/4euINqHr3IXRKgOcVgVVW8T4j9NRaApxpWPH2a5aBOLlGJJpW0JOlNb3U5oEiPavoo4JeQ4xMbKULkpmjaw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by TY2PPF4597475D5.apcprd06.prod.outlook.com (2603:1096:408::78b) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 02:23:36 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:36 +0000 From: Qianfeng Rong To: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , linux-wireless@vger.kernel.org (open list:QUALCOMM ATHEROS ATH9K WIRELESS DRIVER), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 08/12] wifi: ath9k: Use max() to improve code Date: Wed, 9 Jul 2025 10:21:36 +0800 Message-Id: <20250709022210.304030-9-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|TY2PPF4597475D5:EE_ X-MS-Office365-Filtering-Correlation-Id: 75eb940f-6be3-488a-3394-08ddbe8f9bf4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?liTVVSlf5iCHFl4Oh4n3OeNHL5NmlO8RSOspu3q8fAMPOe7kM/A/sJ1Xjj0k?= =?us-ascii?Q?EslyE2Ts8lDzNoBLXSYN/KSJ/qF7dZnMOwygwmZg7RHt4XCbWspNVrSewWDr?= =?us-ascii?Q?RB2oYfs+20krlBl+wPoJm8/e1YqiAqqCxuHiteU2c9BFj6Z3mF1muGvDoXrg?= =?us-ascii?Q?05u2YBrGYT2fM9xK7q1uCSq0/4I5hwdk5BmQfHF5uIc7rjJERAS3I4Az2N+5?= =?us-ascii?Q?JM8KC08aF6QV+lGMIrNPB/jsY6Hi8b4nSvCb4SAjroZgqMW3iapFw3NXEiHB?= =?us-ascii?Q?xBtR3ng+fZWrrnSY1bfe9FA1tXno+GjUy8dW/7weDaYYTrExEOaaDDZfS0SX?= =?us-ascii?Q?WBqhMFYLhFxZxRDiS2FrZsCHBFRBvome12L8wf+q4jv7Oha89XSxXonRUXIm?= =?us-ascii?Q?v0kB3sPSAXWzw51XRxtU96Mm04ObSIpxju66MMD+jybkdhpky9iE+zXlkDLD?= =?us-ascii?Q?4cesabIFT+4HGVPUyv9W1EJJooE8qpJFfxfRgfJS5LgU28Tz5qQzz/v9fO3j?= =?us-ascii?Q?R3byhAQLmATnNnLpqA2andnkkmYulxiHwc8Fhh1JFtEukpZOXGMHMzypmtF3?= =?us-ascii?Q?sBlULzk+pA/UUWktb7O/zp0PPlDlY6FNmQ7iXzEJNCXlEIobaZDFWd8YwCIb?= =?us-ascii?Q?yN3bMcWPX7l8ZXkgKrvJg+px24Q5ra63+ya638hucwTJXXKo5Ybbdntc1I+H?= =?us-ascii?Q?BopN+GqnMObLyWMIESoQ+91MfWqSgK7YbBEcp5KclXLkVzEIJSIdEkRsUg9x?= =?us-ascii?Q?/tNL6QPBDAIsDPlV6GZHHTqMUJgL+PbNW6CTGu1pqZJGCo8PmVHLYW2j4G48?= =?us-ascii?Q?sJfKkB119cEgYWT8D44wIylTSg8vJ8dj29+8aWByCXa9sYVBcE81YpHkVf5Y?= =?us-ascii?Q?ahRP9JPB5i2+0XGqwctrrUAvSL2uXnFYACOFriFbdJcsgvIfiLmqsUAZgccq?= =?us-ascii?Q?SdycQCG6bcRYcdzgtolV9VBkhwWR1Tx6yjGOAfYhTxJbafOj0XJiztUrVWgS?= =?us-ascii?Q?bFoTc/+7pAu7qZs7dRIBkvbgY3JP0VOvfsg0RWiszJT8sR1u/WsL/d5O/+QI?= =?us-ascii?Q?JUzAdpRQwF0o//PI+7bGDO5ptE3/DxKUGSvSFO5Cpc+iOiEmHth6R34dktJG?= =?us-ascii?Q?+RlBXorReCzgM6/7ZGuMjHl/SpW4CUQN7Z3L6taVQHwb8+qvA1L38+/ra0AD?= =?us-ascii?Q?Otagamdm0+sJO7Kmjap9l0rk/i6Z2BgdrsgJ8HnuMiXAoJA/PJPML0g2GFVB?= =?us-ascii?Q?cEJlfkTWE6Cp4Iyhsg/OJcG0xeEQPoYhnW6Q6pBclVcNhrJpFk4bBisZsOLC?= =?us-ascii?Q?Gd6lXfzK/Bo2Zwyizd0lH5pkcrEn38I5qpbovaqBUTM4i6eqAMjQGKaCXhgI?= =?us-ascii?Q?6SM4rC71yoPFIagxiL+mC2fnCdXN0/XIdleGcuY8z5kefIOx4FUJ8iITWXHX?= =?us-ascii?Q?wKjkGfm1DB/+RL1up80PtvFW3zYOzWjGOYBtGvqRHrGJOwwadZYIqQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h4yaEB58runjBV7oKFtBk6/hn7ZLeZKXXmgoJRGisrlzMYjn3AERCV80ycp8?= =?us-ascii?Q?z1X6ZImsjaBlz9j4csN99xX+PnkZZkqNSWq5qM4MypaNP0Hq8up3MiwmrhLC?= =?us-ascii?Q?aIhOf79YNkHUKUU0OvdfhBYyze6h2NBtbd+1M5zP73AXlRQ5oReB3CBx2iVG?= =?us-ascii?Q?25+2NZE6sQ0OMKB2Goo09Fml5FgUn6dxZ4Huj1meULJ9V/dBIGD9jrPA51YK?= =?us-ascii?Q?oKPHnWP+AZ/g2eiBsuGDJzk7ROBqPoWVLD4Pc3nKxNyLOTVwzTcxPrsl3+Bk?= =?us-ascii?Q?lOrAtlOhiYpezcQPZFtDCHILheNEc3bFimMhrpquYUWQ0QAdlrUANiSLvFlP?= =?us-ascii?Q?GphpKwAbJqgTUzPOQkLKImMD7h9mFstdr3AgoVhVep/Tx5xZYPPhHyfaBkQW?= =?us-ascii?Q?A7xPynwmVSHBy8lF6rEMOlqvzBEB7VN4z070+aGmxC5GZGEP2vK4acJDcuu5?= =?us-ascii?Q?8bmk1rte+tZojAOGT/503wJl+4JrkUzo82j+ym3J0vCuq67yF9dMeUgyTw6I?= =?us-ascii?Q?YDGeiTgvzEBpuxR5QUyU6oX53h0Y/LPgGzhrcuCN3ZR+OKAJm2d5LTHGzgM9?= =?us-ascii?Q?OlxwOtOo3ZHR4+vnL9YYWwqApiXjZ+CD0VXKl37U73Ujhbi3Zdm1vlmfWBwi?= =?us-ascii?Q?XtcG+AVjw16LMyCBspPgYAuDGWeoYs0SWVa7gfcil1um/cba0P9HZEbgTeiu?= =?us-ascii?Q?lh/cB0kKkDr5/Je05N3EbDkvIfncl5oQhYrvX6ukv2B2U9l/tvvRenF/m6RB?= =?us-ascii?Q?Ho5jaFgmb0Wx+uEyczAbAE3c4PnvFg1d/iE0sJ3QlLfKZxWEdqDR37Q0V6ci?= =?us-ascii?Q?4ydRvzHc4bVOCzZJfjmcT25AQ0eNFG5woKaKdza71nDbxKhhEVgAIxu6WN2H?= =?us-ascii?Q?zWuGJTpQVPQ/vGDB9v3Gxy+AZKdNEQAzvUNTLA8bEafd6NcRzVy4od2MgxDH?= =?us-ascii?Q?ffrYpR/9iopZvwdiWNY7NZFHzqnw2qN5KP6vnsnJYJxt4EP2w2lwBtI7VwfI?= =?us-ascii?Q?H4NV0u6GRgFwDTZc3DevuEvpN7NOFTjCndAbpAKpSPWDPS7kjjjhF7J3dPvT?= =?us-ascii?Q?ws35EI0m6Lpt2ugneh6+3ufsXWsrBhSmdMDSV/P2eoXpyUJUSKhcZ83TVDAw?= =?us-ascii?Q?3FOBzFqBZXD2ygODYU3SzoEahCxYUL4ZKvz0aqPIYVEbhzS0kYsyv/6KzVto?= =?us-ascii?Q?l4t4kNr/trgJyfPxGVK7hbE1Ny3yMwDBQEi5aAaV72iTew/0I/zuzESas9L8?= =?us-ascii?Q?RYQZ6WWd83qhcTGrV8DFtlnZASVPeBSE9Nj9PyFriysJgqLwnBMYCNyRB0oP?= =?us-ascii?Q?5/g9LEyLAkA/z9peH0/bcWIktRHP3ZlT97P0XhsCi22plQBnBaHyHK/SwYW9?= =?us-ascii?Q?lF+cHkWLSzHWfv9GGU5wV6gRpPlfOM8K7us9Bg6QFegf0bTuK3uYsmE2w4bh?= =?us-ascii?Q?p0wkJvhvqWA2/ltFnDF/7kuVMXWZuj56zl3V07i60i9UGsRQh4dztlP9K6eF?= =?us-ascii?Q?mLWLaPFdQfc/wfDxFPLp+KQzmZJ3d1T4nKaHFLvu0vuFB9GLov7Q0kE6D6pA?= =?us-ascii?Q?gWRrnSdwyfRdgqm6aaBGMnVDyTi0rQuqoBU0X9ti?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75eb940f-6be3-488a-3394-08ddbe8f9bf4 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:36.4524 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oV1jJLB58XDJcjQa9H+9sBfNjX8Pc2v+vHvuaL7ZeiZCuG/fUxxO7DyXKfuIBX7cgMYCnzNIm8PyfZr/9S1wOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PPF4597475D5 Content-Type: text/plain; charset="utf-8" Use max() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/net/wireless/ath/ath9k/dfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/dfs.c b/drivers/net/wireless/at= h/ath9k/dfs.c index 2fb73a5e1d51..370346450675 100644 --- a/drivers/net/wireless/ath/ath9k/dfs.c +++ b/drivers/net/wireless/ath/ath9k/dfs.c @@ -239,10 +239,7 @@ ath9k_postprocess_radar_event(struct ath_softc *sc, * Radiated testing, when pulse is on DC, different pri and * ext durations are reported, so take the larger of the two */ - if (ard->pulse_length_ext >=3D ard->pulse_length_pri) - dur =3D ard->pulse_length_ext; - else - dur =3D ard->pulse_length_pri; + dur =3D max(ard->pulse_length_ext, ard->pulse_length_pri); DFS_STAT_INC(sc, dc_phy_errors); =20 /* when both are present use stronger one */ --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from TYDPR03CU002.outbound.protection.outlook.com (mail-japaneastazon11013038.outbound.protection.outlook.com [52.101.127.38]) (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 09AD5199947; Wed, 9 Jul 2025 02:23:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.127.38 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027839; cv=fail; b=bk+2ogUjHK43AMvTyOkJG9AEgaf+wlGNSNcdkVq5Y3J3moKQwM3rDYWy2yhbA2OiQ7+5hkn4PRIT5QEBtM0XlbI5On5RYHS5HiOkdFdUyS9/XmJbLgslT51+SlAdWK56mHHp4Hh6bOosSq9llK3mdXG7pGxdewdhliApW+FBiME= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027839; c=relaxed/simple; bh=73KGfHuYlMHmKPAeyIuT97kMMUVD+/fYlO2BbqIvbOA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=uHixdzn/bZGm1jhHqGq53bFVkmgdIyBXeFognmp6RnHmw1oXjErebG0bsOkay6+tqigFz/RfXa/sejpNbRKYD4nZ7r1sSdO307ZJzX3CI+GgwZF+90TtLNpL6nsvWBy/S61DfWrK/X6mOQJxjk16BTvvn4kKZgmylhb6Un1Vx4A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=qFfzjYKg; arc=fail smtp.client-ip=52.101.127.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="qFfzjYKg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u3IOxsRd7PfQ+gHcfHvrrxF9aNPKf92G4OAykt158PDDLSyfcNJURVnBHDYEQindK3NbHo3Dd+/TohNGFtcAfVQ+VAzhImWDWTvDwdbe3FGCwTsUtYTIOaZ/p5MSAPMa86yZLqFVJyCNIjhKNq2I3GQ6h12HTNuAokxJ5YYu7QU8Uk5z4yVDxL1bymEGjWrX84pXEtpXtWlp7OfPYLH6BBsrni/oLVshA2s2cNwD9zhK8rqbBp/t+nkrIsBypcyRzI806m7CU8rmz8gFMQdZNmL6zH6O0KpVJ22AX01C2PuervQ+UN4XWc3UCtYqd5ikhI3mmz7HALeBk8W5/P4ZGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GQKFqJFJzxh2vlfi6RV/WdxHPFNuqscp+mC+rDqbQNE=; b=GLcxdhIs0GHhTIEFwULubmnTn75EVrwuvaGxAm2zxSSNdk8YjDrdtZurBUrEajW67PLPqusqpFJ5/MWsEj5aD37JohVFJhMpawL7ZzmnRvrz8GUPCMDWzTUD3IXJak1Z7idtOkEnvYmykBOsUCAI53gUVG4xhI35uQJfVW4ezhC4TBZnin4NedAQn9zThmjh7DNXo8oIuOgkl3Cspx7zIgScUliGenwSZJMKqFt4qdTacE6O0UlmCbxRsACtgwYY0JM69UI5srADZ7+KCOsbKvHfkNrDow1rwaeDYJJyrYFUDY/FCWFVb61/drFfAlbnkpntV5qhw9Ks5qFwYsHF2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GQKFqJFJzxh2vlfi6RV/WdxHPFNuqscp+mC+rDqbQNE=; b=qFfzjYKgTRGBsbIkCs8a4WxTo+tKHqT/c6/ZD11RPow02LcFSgTcIqShwiHK8MMpfZlfE5vPzJ+uV6DwSe2eC8w3wVsDBEzGlbn18WpSCoEqd1ek+S87OyTA/wf2CHYZSYnFCe5Srfgnk5Nuojt/NbYZYO7WZtqleMMdBYdeneF39ab1rFenVl04+wE9vPQl/md/EC4xuOOfwrEQHUgIO7ACjnVHvUilSd2o6F/PsVmGKG4kxuTwuKgXHBHQCnt6iiL516ADpOV0vtEZkGfgDhHg56FTSF5Sqkj82VPAwZ/A084Gfkf3rn1XByifpNJM+TK/x4GYECs6k0PBT6vPmg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:23:55 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:23:55 +0000 From: Qianfeng Rong To: Arend van Spriel , Wentao Liang , Johannes Berg , Kalle Valo , Sai Krishna , Qianfeng Rong , Jacobe Zang , Dmitry Antipov , linux-wireless@vger.kernel.org (open list:BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS), brcm80211@lists.linux.dev (open list:BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS), brcm80211-dev-list.pdl@broadcom.com (open list:BROADCOM BRCM80211 IEEE802.11 WIRELESS DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 09/12] wifi: brcm80211: Use min() to improve code Date: Wed, 9 Jul 2025 10:21:37 +0800 Message-Id: <20250709022210.304030-10-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: ad93c9d3-4f76-4424-a386-08ddbe8fa70f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|52116014|376014|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bMLQMZ2JHsjBNP5gHykA8VHEzHjBRVTe8h7FxHr2Hl49sgQJl3/+VqTMLvHI?= =?us-ascii?Q?1a91wj9IctaxF8+Nc1azFh12lzq3AzOSn2K05Ek9rXyV19W0YOmAk1uF1RNT?= =?us-ascii?Q?ggSEEE+Bk1LXUJoCPV5xvIWZTJ1R8662BXRnCe3blbeFVgJs+m1dsGSCVvN0?= =?us-ascii?Q?z/rsojf+eelFdwTNdw5OkZXI0sp7c3J8MM3QAJNt6PtnuUi4gikQEz8CRSHB?= =?us-ascii?Q?LVpRjFeWncENm4YFzKhIsEPqit33hkJQEbYHPf6idn5x7dcvSprOUe+M/OVb?= =?us-ascii?Q?JVL1+sK+pfFwmwFGPpgqrAG+dPwQlPy5ryrdHkdGiifiyfQlni0xeVs4qeQ8?= =?us-ascii?Q?7HibReK6741hgcd1du+LM74w652rdrVFEzXEDmUDSVsz8OH/VqPjlMrADMb/?= =?us-ascii?Q?oUuEOMoTIYNj1RQT4EVwiKdqDuzbe4qoZWYB4MzkCgPF4yJncb2R+EblcwC1?= =?us-ascii?Q?RHil1lHen9ik9FZlbqGbFiSGbZzQxClsAr+Ee5oSTxAJK+G6QfcaIG6jpLX7?= =?us-ascii?Q?e/Ey9P9fQzepqOiXiVcuYJI+NgSZHYw1/j3mmhq0jJySHIyxy/yI8/8LQIzE?= =?us-ascii?Q?FSKsFwK5tGHYo57XN/Dklyel30hWGAAz/UA0tSvN3jWS8pQo7hKs8nnzeldh?= =?us-ascii?Q?UIbX3JI+LEEW0OiYHN66NfmuFkeTFsuZuD7329WG5+XrDsglgWXFeNm3s8B7?= =?us-ascii?Q?Ufdgt2AiLMnfddfDXKTAMhPyWfazC5M4YvvKqRp/h0nAejH2UBzOTPcnsyFz?= =?us-ascii?Q?U51XLHenWGw+lsrTPq6U32hq2Y4W65tOopddAttrY9pun8+mITZaf4u4/+eK?= =?us-ascii?Q?QM9qpdY1Plou38n3QDFBsOyfPJKX4CDd15AQz7j0GFU1Xg3CKqDU6o8JcB0Q?= =?us-ascii?Q?Co5RNmSNbHGiTB2csHQO75LNnZ0NAIaWSZBHyQb3/ROs5Sf2Q+iKyn5TzU8X?= =?us-ascii?Q?p4aqTIVVIca9cDOrALF18TLa2uLdyYdlfX6rDuV2CjoYGbIsrlFx8XVRpHRH?= =?us-ascii?Q?yRqUBOFWpT3UTS+0NdKUMxdqx261MO6t1M7g0njGON5YkQNicTikHZjfkNtA?= =?us-ascii?Q?MfJBjfoxE7nmZr95Z6Ct6tivzbJr2WwN77G0hWoDtqpp4xQBnlXgNKn+HJcQ?= =?us-ascii?Q?f2ilEm9wrlGoYTIZ5SeW50ANoYYod/UyxI7+vwD9Uie/uO7iCYr1JMQ0rQnM?= =?us-ascii?Q?EdV447ueoz1ca/5UMQSAV59zmYngWwWZqlu5qNOBvYyDi9yeqVZQwx30jgHj?= =?us-ascii?Q?jJX3XnaOGDisNxmAAXzwOjXgeY6mmHp9V6jF0fBST1vUjQwYtmsFX37LPjS7?= =?us-ascii?Q?PKv9ijzkJSNV5ufA67Lafa/K9Rz4DLMV9G9+H5OsATE39FF1BhzEzzNuMMQ5?= =?us-ascii?Q?k/PpPPH2SHUutyabrZJk55KzFj5T6n12xwWopK2LjN6cCHqAZFxIP1aeFcNW?= =?us-ascii?Q?k4lbQZlx4fYDTTM1DJCe8RDEN+hXMFkplp0Oiyk3i2vQ3u+A0CQoUJ1Gbznp?= =?us-ascii?Q?BssvbgcG19cr/Xs=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(52116014)(376014)(366016)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Jp6fBWn9VEgEmxhJvWBEEB9k1Z+58yqI99rmI2ZR4qOBg/8zxzfG2QwlxAke?= =?us-ascii?Q?CysBS2FogbD6l/x0/LFS8hhy9zypoTyrtyqzUOEyGiVTdyeAZCkkt+4Y+FRX?= =?us-ascii?Q?5lQ3Zsx6gW2kFOBmWIBhPs/6Xwn+C4AbZNMqnBJN8CK6EO9LnkJz7lcUOn4n?= =?us-ascii?Q?kj3jndO44GVsJ88HpIHKauULghuiEDqtWL+uVE36a9JrWJeq3ajN2GhAd+bn?= =?us-ascii?Q?pccCsRHwtmXJ3dAM5nVupcTSRe3uev6iA4NAaIVaH+nmRhm4aFAcX0ee8m/9?= =?us-ascii?Q?rQH+3gV19rnY+Wrf0tPZyj+IV1CzJm3IL6J/Je8nFmChPD1ICy6dzyfbxM5a?= =?us-ascii?Q?kRf+a9cIeXNOjoSkcMwU+Ih7SMM0DA8V0O/QCoXBaAy72aEGk4fz0p1+Q7rs?= =?us-ascii?Q?2FEeqBXWSpkPr7Dh6RnjLbEP4njNQxLn7mjErS4k9gH3GkG/6tQ12cniIOiz?= =?us-ascii?Q?cI/T2pQIpGd1ElYpnQamVXnAJK9V5apSaRRxLQ2/cg7KLizBE/SDmjm0GGhd?= =?us-ascii?Q?VUPu1EURUZcwibygGm3L2YmpqwPEMKQqIaGO41OWr9YRP+fNIRlrRiAH7IwG?= =?us-ascii?Q?Sl8iTyE7mFjE9t7DsdwVqFwMRhir5YrkH3dIqFYiY6VY0iuI8xkL8dttpRbK?= =?us-ascii?Q?Q+OfiVSG4fGOfnK15WWTIA6hG4XWlSm/PYcFGOEjwixttubZ/C3efJ2WrXY2?= =?us-ascii?Q?SEZ0X1d6VHI8FeNIE8JNi6VYx8sqmAr/QcnGbyCpoixWiX9LV4UiHgfUoe+c?= =?us-ascii?Q?HW0PR4kuzf5RgTWgUuMbNh3g+sGfzpOhMWCair/bFVizN6mQKvU6UY9IH80H?= =?us-ascii?Q?Ydjm92fvECefAIEaEr4jBJ9BZGb8RnMFc4aRTCHWr1FgbbMWq1d6mOOcD+0m?= =?us-ascii?Q?RwvmvjqifxGak4XExlSHCbxCGVRqQhSpzzDWNubqInNfwQgiriqTTxsGzTb4?= =?us-ascii?Q?m0zQ/uN9j2xK1gtObb5iiqKtCPKfCjDNV1kyGvJ/SZ1spV4KwzVD06LG9kuM?= =?us-ascii?Q?GdwBJjEWugxg69NRrBSxpmUcaHU2tRxK5MbCdhU56A0LNAyCgsEuUTpi2Ihx?= =?us-ascii?Q?uZ0Kn4bhLXe3nCEWRxB7YyzZmJD2x2R1c0L0GeCC5dyFqwLC1HZwv6UXVh3t?= =?us-ascii?Q?SFRlhFWaWI4LZN7dy4+jwGjXCh6wfZBizcd2NGtEEIKDA6SRL8JxNnOOqom1?= =?us-ascii?Q?i9b2meXOuSoXjuMMhCVbwvjlttkQTor46je8qCvufcXNLA6vjXIlIWgBIu82?= =?us-ascii?Q?t9IVeTLY45b6mQPhTSehCtjVnpaIIPasoqba4UcznBY6cM8RGVji2/k/2dOs?= =?us-ascii?Q?VX9wD4FVye+elDHBS7AMKeiQedKrF4dGWwr0pKZ/LiKGqOBGp6x8+yScQd66?= =?us-ascii?Q?dJgf6oJ2glIuciCZtEm77AOMingxuQwO58oFZZGc64UBwiVpSwEuySiGXgRh?= =?us-ascii?Q?3bvTPZfbZd/ES1PvYkBthvmJu0OJjnU96Eo79OYz4OlNkGgw86jb95gSH2/K?= =?us-ascii?Q?EKKGLOgpr+c4IsSdZ9OQvW1jteBsW3rDIRj6Oa+GF+rJNhidOv3MqEW5BImO?= =?us-ascii?Q?mPu76fzEWhu2+kmgbO/xkA2yRRxS7Yz+jFLATFuE?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad93c9d3-4f76-4424-a386-08ddbe8fa70f X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:23:55.0883 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2L0B8swUcGaP8dVCU2Gr0h1pNeR7vTWoOwxzO/VERVw86WOBsKInZsrp4CX3ROSwRNGE1xPCXUFT9qVkc5F6nQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use min() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 5 +---- .../net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drive= rs/net/wireless/broadcom/brcm80211/brcmfmac/usb.c index b056336d5da6..f0129d10d2b9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c @@ -927,10 +927,7 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devi= nfo, u8 *fw, int fwlen) /* Wait until the usb device reports it received all * the bytes we sent */ if ((rdlbytes =3D=3D sent) && (rdlbytes !=3D dllen)) { - if ((dllen-sent) < TRX_RDL_CHUNK) - sendlen =3D dllen-sent; - else - sendlen =3D TRX_RDL_CHUNK; + sendlen =3D min(dllen - sent, TRX_RDL_CHUNK); =20 /* simply avoid having to send a ZLP by ensuring we * never have an even diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c b= /drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c index d362c4337616..cc406699e389 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c @@ -25825,10 +25825,8 @@ wlc_phy_cal_txiqlo_nphy(struct brcms_phy *pi, stru= ct nphy_txgains target_gain, =20 if (mphase) { cal_cnt =3D pi->mphase_txcal_cmdidx; - if ((cal_cnt + pi->mphase_txcal_numcmds) < max_cal_cmds) - num_cals =3D cal_cnt + pi->mphase_txcal_numcmds; - else - num_cals =3D max_cal_cmds; + num_cals =3D min(cal_cnt + pi->mphase_txcal_numcmds, + max_cal_cmds); } else { cal_cnt =3D 0; num_cals =3D max_cal_cmds; --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from TYPPR03CU001.outbound.protection.outlook.com (mail-japaneastazon11012010.outbound.protection.outlook.com [52.101.126.10]) (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 6096519E806; Wed, 9 Jul 2025 02:24:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.126.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027847; cv=fail; b=GOxtcOTiuu13FzMxbBBbGXuBKMoFCIq8/sviBUoGZ00KDWIArOnpPRJzyvnWUY06SSJbFZ8EOwXuqSARY4nD+i6rhSaFftK5dJ0R0mzQ1BK2+od5YAXyW+efxSRFL/RdsfBxFMUBwTpCCaox9XMQqPgYAAa6FGad5ukZpkpdjeA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027847; c=relaxed/simple; bh=LhjJEL3jzZnXNpu23ich/72gc2eILfgqPurkTAj4OSM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=WGIgBZ1w5mkVVbTCF1zOaKgpKPCL6qzgWNK0pcCIWyNAghrtQHMZdKo6yFnBW5Uhrz0W0jR8/2losJQ25YWJ3SXSwUAmEqQlS59n+eyzmouxQsnbNlgVeJM1fJBX9J2JMyurRlnCRlM0JuFIubybY0R+gZFrznzwUTZezH+3f9o= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=TJiZk/V1; arc=fail smtp.client-ip=52.101.126.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="TJiZk/V1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TjigbhmqWdgJa4Cj17Qy/jDrW2RChN++U0PVv/bNpDF9SKkos7PEA+4lAHjjwmp1MMlakYRkpPcSP1rpdpqmXW4/KezFkuEWsiyLCMLgQ2u+3GDAbCYdIBGPnpCkBZmmhzro+OcWKCB+fYFfWCn9gh1uy5LIdXBDW26vBLkPadahPrdpA8yEg/K9t4B9I7t9Ez9B6fXr9EwVh0j0MDKkkNl4oNkY/Ww3+SPJf1Z/bdj4TWw++fEi04mS6q6NouYBx0dFv9izjPS84kukd6oyGrWaOmY6tlhv8GlvJrddQGaLNH7UGzcRDifotY24KdDoNdR6nOvPxH8dYzyLyEKCDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AHwTIyX6Thb01MtKX3qFkV3lGi3dJzh//1qkDeftCGw=; b=J8aodJPCo3ZmyFK95+HTLQmhx3Fl9TmaYFG1y34BIqtF45EusylBd3m5brXWl7J0aFzZgdgH8e22lqfXCxiBBdGtUL4U35zb9sId1tD3HBqJjJU2Lg5GMyLGf41GApJ4qz10NKp2NZ6KJbTxRBjvnCcj3lr8UhHhl9owM793cEeSSuB758H2QcfX2SlAz/GjNJXG7WjiJYOLDOvCvEtquNN9jmHXIH4RZEVFQdtik4EzoEPYA7XZcysuPE5v4NK7KCuy2wk2TQnAhcyTZUeyNMuHIkdwzfnkKlCqMUG1FfoeOTtUyEFrDZPTHUZYRA5VW3G2oYodYDiwChg1v4+6LQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AHwTIyX6Thb01MtKX3qFkV3lGi3dJzh//1qkDeftCGw=; b=TJiZk/V1otUJJDdoWbGBBfY+FL6kCZIx8WAxqbK4ovzLP7LcBTnX8i1f6ynMzJlgOeQ5Gxrv4Far/mC3DwuYrDudsillyyVl7b6dr1nPv4Kh0RnXWK5y2cUJ3CTEudb0pZKN4mjxzruCRCGqNoTpnxEfTY3YfnE9K6eb38/yo32DAk7OD+K7R5H3Brb730kyVWwfNi8Qz9aeIBAam8QKXu0LpXN1g0oBzNNDbE2NjDAMPkA98ZSOspIcYISV7oDQz9/WLCcOXmYzkf6Ax4wi1s9To2XKDO/XPzwGdQ8uK9X3ggK2bzVjrLXlfFnQY6icoGuaS0IpfWGuAveenLQNVA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:24:02 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:24:02 +0000 From: Qianfeng Rong To: Brian Norris , Francesco Dolcini , Johannes Berg , Sascha Hauer , Kalle Valo , David Lin , Aditya Kumar Singh , Dan Carpenter , Qianfeng Rong , linux-wireless@vger.kernel.org (open list:MARVELL MWIFIEX WIRELESS DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 10/12] wifi: mwifiex: Use max() to improve code Date: Wed, 9 Jul 2025 10:21:38 +0800 Message-Id: <20250709022210.304030-11-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: 936c4c0a-86bd-4c2b-7380-08ddbe8fab2e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|52116014|376014|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9dj0r5GQsvSL3awdeu4e0ba4kWXOWHpP3JyOLZg/IcZF2wtryUMNUXvgqcwF?= =?us-ascii?Q?WZVwyeOXIptsouJvyyoY5JwjBhlurVcQKYw6pXSUrPSG8LSmPsuZEsOa2ztC?= =?us-ascii?Q?V5k9jMWEnjnim5RqygwvktkMaHmEvgk2B1N2A/3vtcYb4blUrf4Cry2AfwSZ?= =?us-ascii?Q?nM/nrsXWKS2GHMtWlS3XY6fIxM9a5PzsiOmjgbNA19r43cJbCpZ2Ypk/G4Aq?= =?us-ascii?Q?HCHsvYczHbtgjdAegGNcTKRy4FMtHiAlndAx7M7/hkGgRF2gmKj00Cm5j/Wo?= =?us-ascii?Q?eAsXiln4bYvZ9iU4n9RWd4KQbL/h5CFcsha1NcumZk9i8oPjy/LnuuwneDQp?= =?us-ascii?Q?fgndye5AhJIszPu6QHt0trU4jL4jm6BpSuTNUxu8o8EpAf5C4Ts5LTTPFRLG?= =?us-ascii?Q?ULt+XAQrVBKJhO9gPoHJ9yTgGDELtzrlU6l6tt/ts55GxSu8pqsc5erBW+84?= =?us-ascii?Q?eSD2+zHzp2CtSXpn2TAgPI9wXphWBaaktFNH8fg0kjNOMAibVH90x8boEqlz?= =?us-ascii?Q?0MNQ73alB8RvlCyiL0/Y6/36PSIFRm3nJ23o12YOozCEMvl5bEBgnQ6oE9kN?= =?us-ascii?Q?d9hG5LgvTg0YrPMi6Rg1B1hYtpLPWFGWtXhwGqpiQFastBU83BtREs3zhpYD?= =?us-ascii?Q?hSwXcSWGExvHRg/kjNxVC360t2hbWi88GvDg76PM2yMgr/Y37ccxQeooxWf6?= =?us-ascii?Q?g8SxfHkZlZtOXs//WjBjI8Z6A/G069Pp1ombUSfdQncrQvGkBvcdi+fOqhbt?= =?us-ascii?Q?YzpYSCf4mP3Ar22o4ZBaxJL0uvqzPS2ntf9PPvZb0TpjGx5Gr4QLQjjQxykb?= =?us-ascii?Q?hjYCC4/BStHCBLJR5BJCBfwxJPJmp0mxmGyqsh1p+xVjjYsJj/whiBTN7awL?= =?us-ascii?Q?QIpX7YOd5v6jALdoE4B5T02PB0CeTZtBi0zxYd4BzWOB3dpIdV+DKPpBpuq0?= =?us-ascii?Q?KYgmnOmkVqzNOF5zXXNGWbjwPzE2LRlnbogCaCFyxDVo7J9AHn8mA2BycUVd?= =?us-ascii?Q?NaYC6SEfBsaFvccnvZPQEgxlerNzUhNXcaxqrkCDpSlkKR1u8mDkwNbFlwFo?= =?us-ascii?Q?p4l6PBgWp7QfhDybUcOLsO7tADbbxQRVJLVA57w/LxDCe+PqbbOexrJ2Yqwl?= =?us-ascii?Q?DIM+1BsJTdXdxnWLITk95AsfwatMvwmhsbmC6VZASv4Ucox2ScrFDibgQ7w2?= =?us-ascii?Q?OFaysNOY7g9cyt5Gj5xlwIYa1vk73Vqu8bxiwdslZIynFdWYgc1D9F9CPHqI?= =?us-ascii?Q?/rbt1KexnKYUmiBrBO0CfAxHiupQDGRsAD63JB53SPdz+k+f54aMWIWuPAB/?= =?us-ascii?Q?9jCbi8f+xEacWV+UIIrjLHVb7UDaAmxvCtZg9hLoG+QbthoOfyv+6OS5j0Po?= =?us-ascii?Q?pc9yfeeyZ2qCLqw+YzkiqM267vIOYa+HHaDbnyjf9wX7wW/1idje52evi4v+?= =?us-ascii?Q?Hr46T+JQGEYaIBKZ/W3ubVi5SePJdehU+zlqiK7nLjoPiRg60PpUc1QL0LGY?= =?us-ascii?Q?BlvPJ0n9YTtSoII=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(52116014)(376014)(366016)(1800799024)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aruWCAySiAnyLRluQoV4Ui1ihIbamTfTYxS33H/Ysn+Uyqukm9ivn4TXsmta?= =?us-ascii?Q?H9FAY1LwiRV07B7Dr2XtD+tE6FTN6cQtU3T2RetmLebBroBgPH9PlT4yFBa3?= =?us-ascii?Q?OW302m+cUvtM7Ws94KQytjwnJXuWMNw9eQPfkjDCYKKmcpZSCJ2c9z8Mz+He?= =?us-ascii?Q?1+CwksuJmMHCoHgM2EArHNsdkMd+L+stdYx372k7kkwfy5aAqJeXNK05aPrm?= =?us-ascii?Q?IOWCfM/OMeCbTfOW8m3Y4a2v1hOMICwTj0lQc3gzHPDi6kyePkXo2w4lrmU5?= =?us-ascii?Q?7+txynKF0yYMkFJcCmcAxjcImsCc7W7zDzYqmEnMVxFMlZroiOUynstNcf1Q?= =?us-ascii?Q?1wmrQoUtwLcIFdxq2B6b5yieEgIwQasr093xGMgVlM3DSrZT8A8Q5dQHWZdL?= =?us-ascii?Q?rJHqxYYqcAzta18ncFdR0k/Fg3lC0eeUCeQ3FyIvIli4R+Lo3JymNbDL7bhS?= =?us-ascii?Q?GI22bnpG6hheUyzohgmwHI0NrUgWTx8CgpTpU226buh/4TrWCR0JgbRef3cl?= =?us-ascii?Q?EWnBVdhD7kR6KsaBSNnjNC8LqEzI3eVo55rH+hQbypWSM5IUCKb8innfUxui?= =?us-ascii?Q?+u/a29aYYXNf5IVQ9mItRJ9FWsF7YEmtU48Nl4L4RccLvow4bTM57vDcdmWp?= =?us-ascii?Q?I4zFfUd3JGPHOCf1ZKenvnd1Ijp5og8UsfGnY4rdJHcAnPJ0L365adwTYFt3?= =?us-ascii?Q?wAqbI9oRpsDwhqbVWalx4JyvJ06hFNKu5YNaAQqG7owQ3AQCh8amCUPCDBLX?= =?us-ascii?Q?jM2WQKiQ8cdF7QSSohpFG4VchvVAY7u/b54x8eJlsXUswnCmIh3q/y+eX9lZ?= =?us-ascii?Q?e80HoVxObcWunHjv8VVHMTXGrMBh7tpbHyw0jshDJewSp+LE35XbG3gayGhn?= =?us-ascii?Q?7myS7Xkdlcg5a884c1rlJKraEgtq5zfRKqALI2fHWqgbzU14yHITBOOcNvQa?= =?us-ascii?Q?aCZh96lMruszXk8KC0Xk0x3Y1S/dB/F9AvnSK/REyPSrWAaBtLIciBnLTr6g?= =?us-ascii?Q?H/0fCZOEJZuRWMO5ce2TFBZib+PPmArbZUMyOq4vrx4S2+NyYHxZC4adZ8a3?= =?us-ascii?Q?Lk+w6EuYRwMIcnUYLKUQTcQLjCuKkMxde3eliDckfiZxpHwEnLp5Wk6LNKsi?= =?us-ascii?Q?tFnkP5K+VXwKYhnXEx1fcFDP5myx+T/8wtztE9cuLhewm8sIIBWdsb2Zb2P8?= =?us-ascii?Q?c9nttSjpm3uMtaehnGQlW/pjeaAN0fNiwU3GbxI4NDk8EYJ4y69TeKtTb7vl?= =?us-ascii?Q?y0tKfMDMYUECGXq8IJoY82dgFwcMVxAkMczoySUzWZHdKUn+Z+jtncMU0A2X?= =?us-ascii?Q?gw4EY/zGbco0LiuM82Eixxa+e/lmYSemrWFn0ChoBEp6NQCmnsqEmhWKAGjz?= =?us-ascii?Q?KuCFSzGMwLh2wi2pvcYwVPe8VfU9bhdcqC/E29cmDzkRh2SFVZy6UjMVQUE+?= =?us-ascii?Q?lR9fQmDejtMe+0jEz6Yv6noogfnPF7aTmtfWh4DsWZGkIRkdS/itoLPncBuv?= =?us-ascii?Q?n22QoqVm4f5IG+neXsgapqgsk5JD/NNPOQfD3+Oilvait6RINr9e8ZJANWgs?= =?us-ascii?Q?VXi8CKydXrjdQmhc1/YkLLOl/TnshSaoev6DCt1+?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 936c4c0a-86bd-4c2b-7380-08ddbe8fab2e X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:24:02.0610 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8ysTHRVe9fpbmHZYJiCDHFDZoKBuKHsEb4oHWrVGy7Q4BpXM8RuHJbF6bz8agCdnAs9RsYeGFiZdwRSZg3Rvrg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use max() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/= wireless/marvell/mwifiex/cfg80211.c index 286378770e9e..d81db73ac77f 100644 --- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c +++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c @@ -4783,10 +4783,8 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter= *adapter) wiphy->iface_combinations =3D &mwifiex_iface_comb_ap_sta; wiphy->n_iface_combinations =3D 1; =20 - if (adapter->max_sta_conn > adapter->max_p2p_conn) - wiphy->max_ap_assoc_sta =3D adapter->max_sta_conn; - else - wiphy->max_ap_assoc_sta =3D adapter->max_p2p_conn; + wiphy->max_ap_assoc_sta =3D max(adapter->max_sta_conn, + adapter->max_p2p_conn); =20 /* Initialize cipher suits */ wiphy->cipher_suites =3D mwifiex_cipher_suites; --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from TYPPR03CU001.outbound.protection.outlook.com (mail-japaneastazon11012029.outbound.protection.outlook.com [52.101.126.29]) (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 3CF581A2643; Wed, 9 Jul 2025 02:24:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.126.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027850; cv=fail; b=kM3oKl1l+rINM/Qgs8P4wPQa2eiAT4KazTNmKSNRfI82jF0Ivfyx+Lui00Uy8GOt8J6xRQDR+yVoC2n69Qd3LEY8u6LsjB4NgaM9PPSpwmzLIyx8sB2iK0jQ+jYRzrZDCZpv8AQRFZFhcyFWwzXH8/89BB/Yvg1EGhCB5zSWevA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027850; c=relaxed/simple; bh=MJUS3A6W06bfA+gY+6o/O0kTnOTnBFIVJAuCa7VNrAw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=VirO48AEF4tLW8RLi133KPT/OJPAto1LPTau5bQDMP1W2zb/zpuZBmOHjTHUCdAyZso1pRfwKcpLPMJ/oTAoSRP+ZKUP9XbVVMAI8vZY18GHmgefMp5LHlGgDGCcWwQ8XCekoHRci2lbPswJZAr29zIp6cZYsUB+vnfmlNZVdtw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=gb4GaRSO; arc=fail smtp.client-ip=52.101.126.29 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="gb4GaRSO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FB2Lhb6Z0fy70AnI533wF5co9Ec3Bmw16yXPxuxI7r3/i389usTDXg8qwEqI36SlbYFF3Wd35SWf4m2OX0TfadY17lgVHtNNQAaH+xTtIhh3I7Sae3aulcSNZf2aCCpjMoDwXsHfq2JyXKG508De6b9qVMBxC5eDdHhjk7IgfwhvoJIpyYO06KbsNG2IOBUTMJ+9TsDvHVQ0RMZAdJiUW5rl9upCQwz4g1XctfhDj5qk3LuLIMTAICjRt6VYW4mN9PwmGG1q2SKyCxNXDJ/oXiSW3B8HSdH/HyfN/Lg8jP2s+YpUs+d+U92d8GDWQ83iTx+q8cTVlcjm7Z8p6psJ0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tSCABJuvY14tZsZj9Oh5SSy+SQc7jAPXQUglhSbksAQ=; b=T3giPVfeMlv9V+pb7Ggy8T+CeLxuZMyXyOfV3PswqvSqtnQstWyAMka4uKERpEbfzazNuZ43MB/BGLH5RSEqTUOKrCzfWKIki/8P/uFLWcLB7AyebxcJc4T0xGbdKOu6Wkfcdq3f21mf3r6Bnq0yTYLV1IDpLyukEyYiv3q5n4cKeht6zhAKfhqiZzVbsgMACunU44pR1EWPbdJff/RGEwOVVi2MHhMfSLi6MhXEi7xMYn67yIT5wPt6sKk/LZBgWHkv0BPARKHwV3kvcpJgcX+prJbt3KQBVX3Tj7ue20c4+/3/s3DAQ0fzpBO0VVSpFsnHCgcw2DCnoWCTmqzJNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tSCABJuvY14tZsZj9Oh5SSy+SQc7jAPXQUglhSbksAQ=; b=gb4GaRSOb8t/PHBytYc6rQsCras7tNZnCq6XsaFkzZ4fL76CrvpzlS8PXWVSH61puCcaJ/0RmY0KxM15zgqOND688UyO7a3ylnyHfB3XQbtXMy9rYmxxJc8wFNx+bDIyJ/anmcDlkNSbfl80OKwFPfPcWARCeStggfr00jx3evsEE/qiTq8ZQ3Bmic9+EvyJjEljqHZfpM9tYjc9F0QWyAg0qrhyF5IVXEriNfxPse4WvKnF6oGGRaAD5xpNAcgHGb1JQv0qXE02os5tQ3ho5OzJ0s4TU0VsQIHgJ2ZvobfH17i2beLCc04/XGn7svw8npc44PbISSeo95EH9J6FgQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by SEYPR06MB6156.apcprd06.prod.outlook.com (2603:1096:101:de::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 02:24:06 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:24:06 +0000 From: Qianfeng Rong To: Ajay Singh , Claudiu Beznea , Kalle Valo , =?UTF-8?q?Alexis=20Lothor=C3=A9?= , Marek Vasut , Qianfeng Rong , linux-wireless@vger.kernel.org (open list:MICROCHIP WILC1000 WIFI DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 11/12] wifi: wilc1000: Use min() to improve code Date: Wed, 9 Jul 2025 10:21:39 +0800 Message-Id: <20250709022210.304030-12-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|SEYPR06MB6156:EE_ X-MS-Office365-Filtering-Correlation-Id: 30866fba-8eb7-4769-c5c8-08ddbe8fadfd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?fv5dUxnSF8jD2FcgsBfk6Vr42XxT53O4qWyUpO93+wgvoNFXt2wwPChnmWRJ?= =?us-ascii?Q?BqCBjBJ4x5EtI2GfXKIY4+Aykrfpw3jzjaRMpBKY9nB9RYHWdzxUKjWF8WCz?= =?us-ascii?Q?u9WWGuoH/Net6+o8SGkcTK9woc3MqVWqFvd1zeO26Gjr3p2ohdvKFxN5+h6l?= =?us-ascii?Q?JsnA+nJTeBjHyYANtFoUpHnfHRE9+8B6rHtrreWRVCsqmgy8rEt0l8IzAFSH?= =?us-ascii?Q?rjUfVaE7NkoRO3gjZ9v9nXCxJEv7xCgGhZJAILOpr3qhSEcAj0jpj3SLHBf/?= =?us-ascii?Q?+EnpVtaD5CsxUmAjj4ZbggLgmqsiJnunTQXqogQ1ya2eJftNaKRON+cQEedz?= =?us-ascii?Q?Iq9Y3euFe79D3D72Oj/v8BASNYMaCrF0egA5wdbzteVzKaX+DJXisVb+VDwm?= =?us-ascii?Q?jjtDUAFXo4mXN2cxKPZzf9Y1pjlf3SGZgLbwMIdxF71Mhg74rVP1KwjdGrlD?= =?us-ascii?Q?usYvouIVodWuKRRWqexzU7mq5kHtkz0K7kS1dqHh+u3Lro276jKi1tn40TiE?= =?us-ascii?Q?akFbKFfgyUtGFanUY4olLw4iO+l9/q5PIDwvhs9wzsj4zFamjEGdX5z65jxU?= =?us-ascii?Q?QCd04+Vlb3EjXzt2m8Ymy+Do6/xyaBBilz1JukenPx3tvD7JaUOaTSyhYZ+F?= =?us-ascii?Q?6nDF5rDQNeQb3jtZkXk8l3/FOEzmYHPzai8tfhE1T4ZVwi9MNFYjKcx78CYk?= =?us-ascii?Q?InTx3x7lc0GGxeR+2KMfysdJh2RRA0/Yfx0PjEiMekVAoUiivC3uzZQyqjkG?= =?us-ascii?Q?znuS2zJBTNc7FaaCRnK/xlpfRyA9YbM86xHSx0X7fuuBjm2ytAylQF9gnJF0?= =?us-ascii?Q?rOcs74urBKyAaNMvwo5/jGxoLIfCojoiMI9td1quDqCn0ZqOfWmrkrJAJuHd?= =?us-ascii?Q?IqPhpcaPmHwFMj3yGIQgLkNZb+eiSPQaJn7hdva5hXtc8eeaef/ZJ+1rF3ad?= =?us-ascii?Q?dvPE+Ppsf243Em9/k86XVpx+2oSVEUT7vtrq3QuaQirXm5soAv817qsg6lUm?= =?us-ascii?Q?shMbS41y7qRtGNY5y1J6Th1DxS+XWFKexpFRfa4R2C+d2rhjv0Kx918joNix?= =?us-ascii?Q?aPRyBt03DLZwCxnHlVbaKYmTDL4yXYO7KS5r8EkQxG8meojbZR/Z2qCuw3Ey?= =?us-ascii?Q?UdAB9iJpQ5F9t53//y0UCqy06RfDoij9V3t2r58fF9hwzk9hJgWQzrEr/NK5?= =?us-ascii?Q?yIboqJa3UykvJiLJSngl7ExGTuIsonawyHYpJc7tptvhzDMFsPHRujcN+Trh?= =?us-ascii?Q?yEBcQvq5BbZ5VE5caSQUpRCfZc4M/wzwD2Mr/iO2dW0WdoIogzLY7vQ1h9xb?= =?us-ascii?Q?q91CYzw9sC0OAmqYsr9qPSIvaG4ixlywDgdLSOM9SY/NI5LgGeQxhd8axATH?= =?us-ascii?Q?BEforN23gRv6YNYL5CuFDLz+FoJlaA0iO0AGO3ZX0KXncIYLk16kf/DE7FUI?= =?us-ascii?Q?T/Hb+bFqVfji7Jxt3mr17OXXVs8hhxmwVTpViBHL99pDVmjP0rSzgQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?84vFGME8iHpCPl6lXZ7vCapSxuLWPJJkyy3MSkJQe74yofIQUIUKPZFHF4XE?= =?us-ascii?Q?4M9nQlp0O/iQtHhw8RZY4S9OL38SQnuQbe54sHoqGeso+KcbxAShVFAOg+IM?= =?us-ascii?Q?3KrafEZOxewt0ztrl/5xEK+uMUvrEPARcpnQPI83HHEvBHnWsIv2K+QY5POI?= =?us-ascii?Q?ibCdAS8R6Qs6CEaYc0OGzEEIXAfBt57adF50a0FlqFdk2H9S3OfcDkvMOHj8?= =?us-ascii?Q?wzLlkamztP4/OEpxuNT2I8pDQ9ulKp6OZYqo9EL/+90xM7RsNw6aXFD/Tc7q?= =?us-ascii?Q?l1wCwpJ/ofF2S2xQGR+GxMX/5Km65wGPEwXaUheRMejMCwD9w52ve/BcQq54?= =?us-ascii?Q?Wxmry8bxYQXNBN1+lRjPSvZgGdGMY0GN9ic+464HDcTaMTrGvozRqj/IxMUN?= =?us-ascii?Q?r7SAQ5CvM8ZYf8A10QoJU8V3eMtxBN3PuS+QqPAMKhuN2ML7eyV4WLhEDeVh?= =?us-ascii?Q?DgntvA70+Uc13o/R7+w36bL1Xr1hhVOBAbtFbooO6pDlsv7tUAbK0tncp4zI?= =?us-ascii?Q?WW6DOUgIJ5YwS3uyfTXqnsuDSFEj1DFvpsFoCubAQYsQE2aRBaXWtHylsKPc?= =?us-ascii?Q?6OIR9CLVcDuZO7wbuzNDIJDStK+Ou2nK563740QqnuxxB0J7/jnTqzj/u+oH?= =?us-ascii?Q?DMv6v4Ega3Ko0gJvOLGOKCkXjerPc/BXKEpUxbpEQifzfm8bM7MMGB8VMP47?= =?us-ascii?Q?2F3+uOsCQI8Uly4OogGU2jEcWwq1kdEy8rkZ2GIpaFfr5xMEjQy55xRn+M1G?= =?us-ascii?Q?oGQri3ebfiExEd8t/eRcd/Ult+2dCwOW9jMsYhqtnp2lNxRDuD3XAtV3Sgr4?= =?us-ascii?Q?xJhnYsLPFznY4AYlwLxFlzdIgmy4dOy06VN+1BRfzOSb2jBCDtIMGckYsB2c?= =?us-ascii?Q?hXQX6IQPoSOFDkQDE3fwOIukMjHzN34jyUNTUq5GqSaj4IGI5T5YhUzmm84j?= =?us-ascii?Q?SLuDor7/vahcf/RV1zf4C4y3/oOmaPNa0RJvm1X1vi8Y5ApB+ibv1or+e+SE?= =?us-ascii?Q?4oGmHgFnZoHKwTrPjGxjjeiMDhi5F9ulyrfB5N9hYIf1kaacFXYRrzY00KPK?= =?us-ascii?Q?Q+PAHmxwCQ4BIUhWCC0QLibgGfJfLHWOy0FaSVhc0aKhxZx5ZDRzCSwp4HQi?= =?us-ascii?Q?gNrN8S/P8z6RZxGDxFanZ5qS0Zvv0VfqyWiI5Ksprmh38+lnqFQ+rIAVW6ib?= =?us-ascii?Q?A+A0I2tJ9jCpOeOa3cTD4LevdxdLx7t/56TYN2YXcXnINYKoyc5ALdhDwyGL?= =?us-ascii?Q?7eivpFiFV6aJtrN150D3roWxUWkHbqqt35K5jGm6fiYKYD/vGq6gT67U+xqq?= =?us-ascii?Q?tgam57871TxDJTGjMltOm8NOYC+KEe92nQCjlf/3hizyXwmHKweZDeBHXKNS?= =?us-ascii?Q?Wv+gL09wfFkU+SW3l5tv9BJUgBFi5ckUKE/FecckdqJjqpx3vEoaPc3ZixRy?= =?us-ascii?Q?PyvNM1CV0TqR3xYN8AmswQdlpFI4E1ATA2UbR03uZBPJbdftLg+mT8coTHmD?= =?us-ascii?Q?tkVrXswLVJ56zkxyOgs3ZJm4xu2NmmWzSTj7Ilj+EgxWPcBm+FbPNpYMX1Vw?= =?us-ascii?Q?YFGew5Qd7/30ixwoNZnJi1jMjq1N8aPF0spMUdhv?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30866fba-8eb7-4769-c5c8-08ddbe8fadfd X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:24:06.6972 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mIipA8AKerSSgf6iHho8au70qvFMTbx3+GahhW724UhHbFhB376ULIdS1PgZsPjyrIfm5rFmlhG1NLJLoWby7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6156 Content-Type: text/plain; charset="utf-8" Use min() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong Reviewed-by: Alexis Lothor=C3=A9 --- drivers/net/wireless/microchip/wilc1000/wlan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/w= ireless/microchip/wilc1000/wlan.c index 9d80adc45d6b..fedc7d59216a 100644 --- a/drivers/net/wireless/microchip/wilc1000/wlan.c +++ b/drivers/net/wireless/microchip/wilc1000/wlan.c @@ -1287,10 +1287,7 @@ int wilc_wlan_firmware_download(struct wilc *wilc, c= onst u8 *buffer, =20 offset +=3D 8; while (((int)size) && (offset < buffer_size)) { - if (size <=3D blksz) - size2 =3D size; - else - size2 =3D blksz; + size2 =3D min(size, blksz); =20 memcpy(dma_buffer, &buffer[offset], size2); ret =3D wilc->hif_func->hif_block_tx(wilc, addr, --=20 2.34.1 From nobody Tue Oct 7 14:59:15 2025 Received: from outbound.mail.protection.outlook.com (mail-koreacentralazon11013020.outbound.protection.outlook.com [40.107.44.20]) (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 770A81A2643; Wed, 9 Jul 2025 02:24:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.44.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027872; cv=fail; b=EJWDOS8C0LdCp5166ITuLB6GUOGKcgrWRzhewygXELImQS7j5hPI9/ZwL2cc3NhCjYijbbpDtd6QaSf5TLv+Eb1c7xtToDg2rOFuF4XfGVMbYP/VtXShoC5LPlnOac1iy90n2q9wpAQtGPYHNz4N2dwxvapr0uRdjQ1fC1ekjMM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752027872; c=relaxed/simple; bh=9smOcFZvTwdY2IIoUEgyNRm6i9lAsS9zYQrFm26pSHo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=nZ4sZlCMKxrOGJ6Ava+Xk9E+bUKPvpmJFpkIqWiiSuOLxoaIEIvPDzeZ1kU4nh6s5f7LDB+TvxUjUE02UJk4A9s+pHG2f2Ttg7xPZmHAcx7y7rKm1wsGC8sOfNlL9bMoqT3RuO9LnHHKuvsQNDhzg2zh4luJoZOjVzoqZ8QS/zs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=Cvj8LNXH; arc=fail smtp.client-ip=40.107.44.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="Cvj8LNXH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H3jla1C5Z4RuAeJ+hzimcjBS56c7/rqURJbQ6sJKwsLv5k0uieh00ct7R6WPJFlgetrZxUdahBJqGSwVv+47opR4WXvrh1XVhLq6Ks9Og/jGQ3cjl+ViRCSyv502Qfb7xD2o28mzxWTdNrGLq6ZfMmaG4TKQtEckNzBlJjLlGjg8pio4e2ETimhMQo0gkZf4NeX+wvzbcTV4VKb0QqkLOQgUjgFo+Q2yu4PXqgNcQg3HTMdUQ389pRjD1V1rnoISLnWShepARQ8EG4Q2O/NbxryyLhdji/cN0T/7RufMG4Ru5/kz5lMWOXcxAF79xnFYFo81L7ASs5dKWFzV+06tGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9XPSMdpITsu899xaXlZDUszvu0DzG7yMtt0zE7tIjGE=; b=wVVSzbVi0pJWN8znfwXLvNcpk+A/SDRRkMqkH5U5StzwQL9DN+QotldecdonK2k4LYV6M5VHztEH7ucX6uPESCye0Y99tLRpiCYPcaRhZts01BE8iNIvo3i+gzDxIGABdqtLRPh2nQR38FZ3DY7x6Ld3xHtFW+82wSL0PYMwfxx/B0wiCdeSTFanm74NYqI4ksVDphmrY83KQbl4QT8V4aGs1jYKFK5hEu/LRVQgpt8uHuyhnK4wC1Ynx/H0Sth5U05QCOXSferTFp3H9aPSkZpLNGyD+v5xb0nS6Ac4gy0QDW2AAXMQTiTczAx83WbWciYIo+0P/zG1rx3SRRCxzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9XPSMdpITsu899xaXlZDUszvu0DzG7yMtt0zE7tIjGE=; b=Cvj8LNXHhrfV4zhNmydbNxcdasHplFLIOoqyoj8UBRqx6GCXJWyxgkZ7rzqQrUONa+NIAZAGfsH9BAwGUiVMa2WtE6IaB3x067Fj9GBjTt6KpJYh+QSha+DBcgIcIytBq7XkCjnU/WrMp3Yl0VwQ+KYNvvya5VGr1zL1Y9Dvt4imJPc77jwuxUmwh4WRxgUVIBWAAbIkmozJ+g5ST57VaygsjwC4/Rp+uxbCLP3l7ZyyAtFXzXLgMlYkvExiy2oVdyVDA78BxAeqMbwqWeqmSxSSmP9J/0BoeN5elNoIC9PPjNXH9EKKHz7Btn3DEWgXivcj/sdX0SuvjSXLg8gdog== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) by TY2PPF4597475D5.apcprd06.prod.outlook.com (2603:1096:408::78b) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 02:24:26 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%4]) with mapi id 15.20.8880.024; Wed, 9 Jul 2025 02:24:26 +0000 From: Qianfeng Rong To: Ping-Ke Shih , Qianfeng Rong , Arnd Bergmann , linux-wireless@vger.kernel.org (open list:REALTEK WIRELESS DRIVER (rtlwifi family)), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 12/12] wifi: rtlwifi: Use min()/max() to improve code Date: Wed, 9 Jul 2025 10:21:40 +0800 Message-Id: <20250709022210.304030-13-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709022210.304030-1-rongqianfeng@vivo.com> References: <20250709022210.304030-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) To SI2PR06MB5140.apcprd06.prod.outlook.com (2603:1096:4:1af::9) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR06MB5140:EE_|TY2PPF4597475D5:EE_ X-MS-Office365-Filtering-Correlation-Id: 00367fdd-947f-42e5-b45b-08ddbe8fb978 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ncBAkT7NGeUyAikiNOEWyH2PDmBX140+VuZvDdDl+zDAt9QHnXs0JysFpb3Q?= =?us-ascii?Q?1nCAmqYSNT1yjzGBBEjBgRx8IXuHnF+E704mDxpfv3X/ocOZTY5bFoRia+6p?= =?us-ascii?Q?9XUeaRy73ibt2mrYstX8JEkz1IXTGxdNAHXgsVs1tFCuCKL4uov2OX0P2lWE?= =?us-ascii?Q?AlOnblwliRL7rvQmle2f05flem83NtG+irsvkpADa7Ph34/gr8nZQaOoW/um?= =?us-ascii?Q?d+wHzd/i4kVAIZG4HkHL9lxz2rcJjxJChlcDC8zYClEVknyJiHWp3kVvh2Pj?= =?us-ascii?Q?ypFti+CZnbpQSZ9KUJ9ohhZcmD998EPTJtG6yX6eOokU5e1da44MzzzRuUAc?= =?us-ascii?Q?xAjqLrciR+0MLjEK+WfbYSa3QBkSj0e1QrsxuEWWV0GEHGfB+lYLZwg4N4GO?= =?us-ascii?Q?86L++8XtDsaFviAzGSlShZNkosVZt+QcXzsdUaI5yfKz9VZBbJ32MgoUOYQh?= =?us-ascii?Q?194F+ODyJ87QooTsPtG1fzPxawADfDdOsTVVDEqZpxA3X4L9ZMuEsisrjyQm?= =?us-ascii?Q?uuZIYM1xxnMJ9HYKIb/x7wPPyBR5im0VIIV50UAt3pS7ZigYAMm2ko22Ca40?= =?us-ascii?Q?qJwmWR6cAsWNoM1QsV+ZYa+1rMyp32OAo5n0tABwkDceNIu5YJ9ScbhsbJGX?= =?us-ascii?Q?M2nnxkMx7lrOTxGCEncGQAzOeBajy6WwHklfqzFKIF29TUnVs0i+cvIZr+GS?= =?us-ascii?Q?8QYU7A1zwrG/TfYjxfHgnjM7lF4vcPIXa4zjc7S4N/SrbdeILtk/Fn8h+i6d?= =?us-ascii?Q?B4+wNEVy1D/3ZFvdfZXawDzBPu/2fIRnmPVaWfUgKxbm3pR2meqnRRilFgQt?= =?us-ascii?Q?dQq2U8rssNuOcARdpEfDTrC3/s/7sSzPvSI1YVOPqcHqIuJvQpCcOId7E7UA?= =?us-ascii?Q?6KHWLVGjtmY5tBkQesQMXhjEa0jLTHx20rzyIUpyvcj9523Ygf7qJtOiERqA?= =?us-ascii?Q?oDRtLP08rfrfJwWnBqAWDL//ODEw5CGj9ZhmAa/qqFePfiSiS5DPS4WwWyP0?= =?us-ascii?Q?M5lTWQdZLuJpokmaSDHCpxokWOjd5/WpyyDHFzAxGEZYHeo5ARF5MPYmp44v?= =?us-ascii?Q?8OVEAWvLB3oqDLK3diJX7MLsv/6NbvRgwQIuyRiNa91DXKD/ENrdE+e6lS2k?= =?us-ascii?Q?l/FSWlJ3TleOCFejwq3ejfPjKa0mm6ZlLmOEtoqc5QCxjd2cguwDX0HX4uW1?= =?us-ascii?Q?r8gCj9VxI4cXawzptj96nZjBozuMifitQawyiwBGAahy4Yl93vus+hytQVzB?= =?us-ascii?Q?7TdisXBurY4A5PEgeRZm9EWYglpwPHXXYjnnYSPL35AkytinwVsqNQbDN8Oy?= =?us-ascii?Q?Is9GpaJ1Q4ozphthN+51zyBVrbR6PE2+aWjqzlLBq7KHJfyosgtHPxz42Wtm?= =?us-ascii?Q?alBNwT6DLv5TQGd0A6RE3BRb/iUBS78Q+z2DRi1T7Ncjx4163K5bjoiAhhTp?= =?us-ascii?Q?4u7k8bqXgzV/PL4kDL8fKyiRP8nwhhbLK/CODPpSPYrwf8d2VVZU2Q=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR06MB5140.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/QKqyLA5QsQejFfLETWBsp4qcJPT95W60mouHbZpjZh1lFWvN73dibsM4YK7?= =?us-ascii?Q?Vvmo3qygNdg/WL773cx4wRu8JkkV6TBWmXqD+vGZMpvzeDmoTjmemYJy3xad?= =?us-ascii?Q?x4pDNyHHh6OLaPP4ZX2TR2uCr2Ixn60ZmedKFtR46LqSM37/rD7cv71c1OX8?= =?us-ascii?Q?/TvJCI/7tu9vQVvMLU7MVeAN9NAeL1C+p5RxVLgeIrmvrCJSxngJBSOl6bgz?= =?us-ascii?Q?95dEgrrOATzyxJkhCsLPVddCpvSQdqKDbV2sp/XbF7Ft3Un75njjM5LKyvVq?= =?us-ascii?Q?B/sJ3L6wdmcwsgIzQ5ag+bgeEgNia1Q0mdVO1WKl3d+5inLF+/M5ifd2IudR?= =?us-ascii?Q?nOXyWT/yZ+riclRbEI7pMO29Y85i7VXcBAaYkYEgVRX2CAkqwjQXbk61memB?= =?us-ascii?Q?2ovTu+RZYxP3d7Ae+zj/5q4aZW1pDKUtrdHa8By6D66Bts79j6NXzpF+lpW2?= =?us-ascii?Q?+nngK9k2Ba2Zn00zH8YdV/YunAwnunLQl5SCMUmMBV1Wqsoe+1oB2CiTIjcu?= =?us-ascii?Q?J6FFl6RBP8GbSHFFa8pgsyazvHkT1HjZzTGWcBcy5jNJLU1vL+GLW+MPG0kz?= =?us-ascii?Q?aWe3R9ok06VsP1ItTlqmLQDf99KNSXJo8RdTEVJgkRvUf5gBQXbM7BfXwAwV?= =?us-ascii?Q?MaBrnyxalj2dxzf4+a4gol8OYgWT5ljpYE9MzrdSfMTKNcKGkcnRhHoUQN6a?= =?us-ascii?Q?vsmVFn+mmO1/hT0GtYEkCPh8QmFQriNqit/g1XHLflhaHlFtFK2PR+28OOHy?= =?us-ascii?Q?KHSTvGjpNKK77OHaav1/KMr4Gzi3Qy8atXQanKg26WlSE7i+jgA1UR/6lLjz?= =?us-ascii?Q?fJh0y/NCpTw6ZGfgzteToOKemTahvIuInteHCIJGWC5TExmT+PoA8yf8HxBh?= =?us-ascii?Q?FRZDgYA4wAp8oy948FZi2S+CXSyJf/RllVd8xbeYqtrvsPXdTKD6UPcfHAu9?= =?us-ascii?Q?LjOCjkHS6MFRapQ5FJqu7dy+JKrguffRjd/YvJshhGXUA95HTsNbNPpB7W3I?= =?us-ascii?Q?XUi3RK42y5CpDiB0wdiJoFFVD5GjwAF+Iq35Av5WKJ1SKioEKlCVmecXXQG6?= =?us-ascii?Q?+QdrUz5UPWQRKs65sDOdSVdXjyZnmucVrYrZqw9i6CmqJqkWvYHs3W+14Xsn?= =?us-ascii?Q?BKrXWtZbxK66bsM5Z/ioKX9zgsWnLt4S4K95OC4VwI+2Doka31WK8h9Uxf5p?= =?us-ascii?Q?sw/y4rg1F7MPkplc/tN/563p9HvQqEQVZ9Uk9ocVUuKX7fwk/iti0/goIhvJ?= =?us-ascii?Q?X02ySj9g+n1XwJGhpyW+lwgVgQR2d9U+em5XAMHt81dBUxEqZ7bnzGD9yQxh?= =?us-ascii?Q?e6GoaUXU6wey60xHz04/zq14H58Yg8Ek5NPQX0Qs0ERRHtb88XvTl5+tdOLC?= =?us-ascii?Q?TtrCsY7nzZbis2E0JsdZaNzFAJwLUKdnsLmsTLwYyyEFypHymIh6qiDdVevk?= =?us-ascii?Q?hTuLZ+blev6bGdpClXCLFDvM3UTuXzkwgz7vTZqd5WyPcv/COnh8cpk2IAq3?= =?us-ascii?Q?VXKhojMJ1UqopOgSx3zg0wlHsu4XlawR9Ypm5KvgPRr+5cizMR9HbsrBtYZn?= =?us-ascii?Q?1L6TVndx1bP1Umsau3dN7spoa4DTbnusfQyyvXsg?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00367fdd-947f-42e5-b45b-08ddbe8fb978 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 02:24:26.5399 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: n9Qu1BeOnTkloArW0rrraLUm/qcJrtWbrcCWdvJZrCfIepgKXZtifxqWTzAV3odtSGngCZXfPpVIfXY1MLGh2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PPF4597475D5 Content-Type: text/plain; charset="utf-8" Use min()/max() to reduce the code and improve its readability. Signed-off-by: Qianfeng Rong Acked-by: Ping-Ke Shih --- .../wireless/realtek/rtlwifi/rtl8192ce/hw.c | 19 +++---------------- .../wireless/realtek/rtlwifi/rtl8192cu/hw.c | 17 +++-------------- .../wireless/realtek/rtlwifi/rtl8192ee/dm.c | 5 +---- .../wireless/realtek/rtlwifi/rtl8723ae/hw.c | 15 +++------------ .../wireless/realtek/rtlwifi/rtl8723be/dm.c | 5 +---- .../wireless/realtek/rtlwifi/rtl8821ae/dm.c | 5 +---- 6 files changed, 12 insertions(+), 54 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c b/drivers/= net/wireless/realtek/rtlwifi/rtl8192ce/hw.c index 5ca6b49e73c7..dac6e271410d 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c @@ -1487,22 +1487,9 @@ _rtl92ce_read_txpower_info_from_hwpg(struct ieee8021= 1_hw *hw, rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =3D rtlefuse-> eeprom_chnlarea_txpwr_ht40_1s[rf_path][index]; - - if ((rtlefuse-> - eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] - - rtlefuse-> - eprom_chnl_txpwr_ht40_2sdf[rf_path][index]) - > 0) { - rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D - rtlefuse-> - eeprom_chnlarea_txpwr_ht40_1s[rf_path] - [index] - - rtlefuse-> - eprom_chnl_txpwr_ht40_2sdf[rf_path] - [index]; - } else { - rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D 0; - } + rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D + max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] - + rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0); } =20 for (i =3D 0; i < 14; i++) { diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c b/drivers/= net/wireless/realtek/rtlwifi/rtl8192cu/hw.c index ec5d558609fe..95b1098426d5 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c @@ -163,20 +163,9 @@ _rtl92cu_read_txpower_info_from_hwpg(struct ieee80211_= hw *hw, rtlefuse->txpwrlevel_ht40_1s[rf_path][i] =3D rtlefuse-> eeprom_chnlarea_txpwr_ht40_1s[rf_path][index]; - if ((rtlefuse-> - eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] - - rtlefuse-> - eprom_chnl_txpwr_ht40_2sdf[rf_path][index]) - > 0) { - rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D - rtlefuse-> - eeprom_chnlarea_txpwr_ht40_1s[rf_path] - [index] - rtlefuse-> - eprom_chnl_txpwr_ht40_2sdf[rf_path] - [index]; - } else { - rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D 0; - } + rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D + max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] - + rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0); } for (i =3D 0; i < 14; i++) { RTPRINT(rtlpriv, FINIT, INIT_TXPOWER, diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c b/drivers/= net/wireless/realtek/rtlwifi/rtl8192ee/dm.c index 17486e3f322c..0108850bb9e5 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c @@ -223,10 +223,7 @@ static void rtl92ee_dm_dig(struct ieee80211_hw *hw) =20 if (mac->link_state >=3D MAC80211_LINKED) { if (bfirstconnect) { - if (dm_dig->rssi_val_min <=3D dig_maxofmin) - current_igi =3D dm_dig->rssi_val_min; - else - current_igi =3D dig_maxofmin; + current_igi =3D min(dm_dig->rssi_val_min, dig_maxofmin); =20 dm_dig->large_fa_hit =3D 0; } else { diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c b/drivers/= net/wireless/realtek/rtlwifi/rtl8723ae/hw.c index 21b827f519b6..26ff551f054d 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c @@ -1449,18 +1449,9 @@ _rtl8723e_read_txpower_info_from_hwpg(struct ieee802= 11_hw *hw, rtlefuse->eeprom_chnlarea_txpwr_ht40_1s [rf_path][index]; =20 - if ((rtlefuse->eeprom_chnlarea_txpwr_ht40_1s - [rf_path][index] - - rtlefuse->eprom_chnl_txpwr_ht40_2sdf - [rf_path][index]) > 0) { - rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D - rtlefuse->eeprom_chnlarea_txpwr_ht40_1s - [rf_path][index] - - rtlefuse->eprom_chnl_txpwr_ht40_2sdf - [rf_path][index]; - } else { - rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D 0; - } + rtlefuse->txpwrlevel_ht40_2s[rf_path][i] =3D + max(rtlefuse->eeprom_chnlarea_txpwr_ht40_1s[rf_path][index] - + rtlefuse->eprom_chnl_txpwr_ht40_2sdf[rf_path][index], 0); } =20 for (i =3D 0; i < 14; i++) { diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c b/drivers/= net/wireless/realtek/rtlwifi/rtl8723be/dm.c index c53f95144812..c65d14fb914f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c @@ -468,10 +468,7 @@ static void rtl8723be_dm_dig(struct ieee80211_hw *hw) =20 if (mac->link_state >=3D MAC80211_LINKED) { if (bfirstconnect) { - if (dm_digtable->rssi_val_min <=3D dig_maxofmin) - current_igi =3D dm_digtable->rssi_val_min; - else - current_igi =3D dig_maxofmin; + current_igi =3D min(dm_digtable->rssi_val_min, dig_maxofmin); =20 dm_digtable->large_fa_hit =3D 0; } else { diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c b/drivers/= net/wireless/realtek/rtlwifi/rtl8821ae/dm.c index 76b5395539d0..f8b159c74658 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c @@ -756,10 +756,7 @@ static void rtl8821ae_dm_dig(struct ieee80211_hw *hw) rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "DIG AfterLink\n"); if (first_connect) { - if (dm_digtable->rssi_val_min <=3D dig_max_of_min) - current_igi =3D dm_digtable->rssi_val_min; - else - current_igi =3D dig_max_of_min; + current_igi =3D min(dm_digtable->rssi_val_min, dig_max_of_min); rtl_dbg(rtlpriv, COMP_DIG, DBG_LOUD, "First Connect\n"); } else { --=20 2.34.1