From nobody Sat Oct 4 14:16:58 2025 Received: from TYPPR03CU001.outbound.protection.outlook.com (mail-japaneastazon11012047.outbound.protection.outlook.com [52.101.126.47]) (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 88858286400; Fri, 15 Aug 2025 12:16:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.126.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260189; cv=fail; b=jRl24ngFbgYgsdsxK68+nrV9ppAyrIUh2yuf3IuRx9ghxjUBrKiicQvN2J14XXzCsfywneNilXrxXqF9vktqdbj+TfBY1+sAPnxfkjqCYrHImfqPeXozbpnj4nxbOJr5Sg/pFpvPKmN4FsJnf+yyd7DgLySIvL5h8BET27MNblY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260189; c=relaxed/simple; bh=IzmLO8BV1TZyY8Qc4TvJzAsN7SuEYmn7A8t0wT1H098=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=aXyOMeVArdte5kcHdtfmtXq5HQzPX9esndcixOX66tEwis5AhueOUY9K/egydcEg2s7N/CTSa4rWG4PiKaeeBjh7oET97AfTjzCYV0PPJL98QAaAsH7lh48s6TX3KWzZz/37oQj4qxlF8MYlQAKV7L0B776D9wbMjYt0RZzWGyE= 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=cUGNlgB7; arc=fail smtp.client-ip=52.101.126.47 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="cUGNlgB7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aEUUA+PXx79k4hqdoVUSAwSVJODlniixUyiMhWHv5KLwJCRE1hWm3AHW62UQ1n0C17o2mR6ed05bqx2QBjsybSfc13ffX+czX3rOLnEGaLeuZrl2l/0/wKeTMpzLgQnqnADPDNo9VwGW1XrY6Uoew0bhn6/GgEfWq19hNVY7RoL7KM7SwxIrUjU0I+/VZ14bSJpv4N4gVkvZHypTh/PNk0DBmtpbE8sLKXSG+dSS4Ph8aKCs/lBwzL21u4vxYlcKWV6jBx+jIfDs9DXQNUfTOU3z3hWe5yHYkYWCQYMq8np8KRpU+m5oRGKX5sb9YBS4w+cnkJMsm49iAR3EIAdljw== 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=H1dZLkMbsZbyG8SdUoPQA/ggMc4VxD9pp5Dy6ByHCzY=; b=TTao7llY8oTa+tBkom+4KqOhQEeBzgOoL5yqmh3xpevN/r08BtYoV3c4H1o/MSJrUpQgB6go4RNY22xpk5h8yE7OYGZp6mjkDdc6zv/B9fYQ9Yf/w4wjvVWjVRpH9OAnVORA4mZ6MK7xZ433ScYCPqD2tElp4qLdTz0D+Nj7JIUZ2Z/pB9Bk7MDtcprIE52Myz2okvZF/U+aSqMY2rrl/P1pBnB2NKhWpgMOiNc2re9qjupBqkSuPpd5Ob+tnnPkCEesucpk+P0slht9s6KywKuxr5C2aJu/4fJOAecDj2hKT2mJC7OWshadcc1Rfye9m/VxlJhK3vCj7kWsAF2ZGQ== 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=H1dZLkMbsZbyG8SdUoPQA/ggMc4VxD9pp5Dy6ByHCzY=; b=cUGNlgB7tw6n8GURI+sv4CORI4QBdMY/T+5Vj6FveqwKRkCSioZeGMIZqDrxi6bf32JEfow6ZlwEQz+aPuZLyEw1mGBIcTA+xtJ1uu8igiE9rC7rjOXkhS7TpSdOEVmKbYkCIccSBDEPt+c+HFVdKUy5aE7/JqgNAk2joVnOGNinh0gCYeWWYmWgC7vxoDA7tU+OhwPbfhGG1mexBWtRxPP6YSLnRZ2imY7qkTEl2hYO72EhZuZlBJmU8yfZAbCFzOO5S+Sx+VLRmRXiTqtwMVdJxUQKFpo+61UfE1K9ABOi7prEEMzZi88jwwoJ0czeTHEZ19+v86B3U6TBv9nHLQ== 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 TYZPR06MB6896.apcprd06.prod.outlook.com (2603:1096:405:22::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.18; Fri, 15 Aug 2025 12:16: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%5]) with mapi id 15.20.9031.014; Fri, 15 Aug 2025 12:16:25 +0000 From: Qianfeng Rong To: Anil Gurumurthy , Sudarsana Kalluru , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org (open list:BROCADE BFA FC SCSI DRIVER), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 1/6] scsi: bfa: use min_t() to improve code Date: Fri, 15 Aug 2025 20:16:03 +0800 Message-Id: <20250815121609.384914-2-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250815121609.384914-1-rongqianfeng@vivo.com> References: <20250815121609.384914-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0196.jpnprd01.prod.outlook.com (2603:1096:404:29::16) 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_|TYZPR06MB6896:EE_ X-MS-Office365-Filtering-Correlation-Id: 272ce60c-291d-413b-2652-08dddbf58dd9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|366016|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dh0tgfRJGUjchaSCEAv2IAg0lnUnBMW7cMjVjiT5Mp1osJIX587qiu+PrMbM?= =?us-ascii?Q?VhH/ktUdAXXnfvwlup+TvoSYeYoQk6CAXUjWFKP722v49l7ao6r5hOjiXcVv?= =?us-ascii?Q?H1HG6pmJ6SFu9Ct+qHCutm9pat5uLknoVPl8THqr+5S+2abstMEk8AXGf9ys?= =?us-ascii?Q?3f+xJyUW2lbJh2iwFuhC9EcHhmFZo5ILCw0/v5wSN6h/4lRAYJOz2y54M67/?= =?us-ascii?Q?ZjARJ2JYGQ0NuK56itzGlJ87Q52Jtqks7BQUI6pG+bRbpVXc9tBIIpRGYb+A?= =?us-ascii?Q?KuCZNn3hhXF5sQjBh+ZDcL3ZBI2aysXVhAFZCmhU80lnrufkqtEyjGPihI84?= =?us-ascii?Q?fl9Y3RKl+96ce9si6ao/CZoMxrkxsFs53sI4+ZfxR5l6jl1dvlTpRT+9XTDe?= =?us-ascii?Q?4MzQPgjmG3gV9BQJADa4ZTmCcbiqsJs3rfJRm3tV+st5+oN8U2uIXV9jHUmf?= =?us-ascii?Q?pjNBzFs8xfj/FJKe75SZejOEb9nGYnma798pU/24zqRPi/pq3lAHqjz6E2FD?= =?us-ascii?Q?sz2IToFxvQ+Io+N+aMUC/dFnFsV6fX6HVw4+N69yVUumaw/var/GtaH1FfFL?= =?us-ascii?Q?CC/dywn5QNwPiDbNt8AiOCsmJC4rDn1OiwahOIErfum08tmkr8pYc/CZdv5I?= =?us-ascii?Q?xRHV5I6nSnYmsZMCVr94+0/3AKGo15o4nZKcojxB74lZL58jXAXZV06EKTxA?= =?us-ascii?Q?02n5wtbL3uBpQ97Cq3TS+Lpm9ZTqmL0XU4POxS65YCXvItrzUr/2GFlzdQO4?= =?us-ascii?Q?aCABrCircjGBUG9SSTfOVx2IYHVTNGCcVrqp2kJj/BGexKMebHKebgQNBecV?= =?us-ascii?Q?gxqO/IuYEVuHJxVnn79OT5pVBM0A6nol0mS2tp0IPKdyNOWZgBxgod1xKK/s?= =?us-ascii?Q?4RsaWG+Yw5cexKotxY6AbhC8VTvqht4op+NfUkLLEVXjjvgrr8pf+/t5Kh6e?= =?us-ascii?Q?w6jvYifLm3t9WLln71fxhsbqJv7XKUTsGXuqZ0Xv9kZ5kTV9gjM+L+Og0aUd?= =?us-ascii?Q?BDtjq9inwLSfZ8OTMkAiVmY/JNX0y5iT8pmSepWpLcKadVipMqqQpXtSzIXY?= =?us-ascii?Q?4vwUWVuI7KNRnkAFWyCTt+tJGjmfe4XJ/oudF2rc29frin9kI4F3yGuDasAX?= =?us-ascii?Q?86fq4iEweh2mXv+Dr1fdKeEBbFJtUqHc69NqLY0sHGI0u9O097Ni3nwIghht?= =?us-ascii?Q?R8Vo2XR6mNvCWuumuS7FPZi9QBfTSjemWM3kXw/+iT5XpeQvkIzkKndS+gRi?= =?us-ascii?Q?uHoXBot2/EcNtSfSOlZYytquTpQpbu8+EnArCz2GBFvbdh5iZCljVIQmEPSV?= =?us-ascii?Q?CwXExTBHnAADVLrdGxGOJJ+9Xm2/jfAuUVgofmTu8egmlNo6+4MgHKHkt7xA?= =?us-ascii?Q?qppYeDMjZJ3l3DDBMuRNYIO8Zkr/9t5l9v9TDoPPUuz91i3z2fv6bRlVJ6v+?= =?us-ascii?Q?noBEcjhP0K4QSfBk+i6czSzWV5u/rgn7c9NqIjDvoSyQPARjnKzGrg=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)(366016)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?67FLLNhaIeYbexBENJX3apKc0CXQEcheRZK8u0O29jqZq0ZLMujan5zCZ/Cr?= =?us-ascii?Q?TZCvMmu8q6ExHZ1T1+4k7PbX8tWmyr3cOHnRPWBql6Cleevs5aoCrg9dPL1c?= =?us-ascii?Q?2HaJkouj1MMb5tNQGPyafK3cLI6TWcRJFZs7WhDID57n5Luj0QOrxYud1Hvc?= =?us-ascii?Q?lSoj7pMIGJFH5eUEMZJC6lH32+0wblVQJMMhdLCo1ifrhgOscrJ/kYSDRVBj?= =?us-ascii?Q?0ODrTqSQNKpDArJVaWz24Hak52s62UOSuFOx9KdwKuDN4qRcTv41Q76oUQJ5?= =?us-ascii?Q?ZW6sWISD27RmbkIqbmYGfHiXemb/xrV8ETBx8tlQ6nYNrDc02L3HRbJPvygY?= =?us-ascii?Q?H8P8ppTM1hjhcsU70DbsPj1VswxUBRQLzWItFKZ0x61V8Qw7byRjFG+Vkvz8?= =?us-ascii?Q?RQI8TX9T1qmnuYw24DUh8yt6zEoJjeSwDysJRMij2EF9pA4uv+LztGOxsGx2?= =?us-ascii?Q?8SzYFZMi5Sh0Gr6l8G42EF4vMVZEHSyZknB8w/OX+/CB/omum5XTZklgzqLM?= =?us-ascii?Q?wDbsVUCGuZU2x3F+qpl9byVL4FSBVgohYu6BcKaJvk95C8wnsTlZAwE9MU/2?= =?us-ascii?Q?hpaae57YSpvk7uiEC5qtLRyDtT7CT0j2I3/rcNfMWR/yAolmP76VEspcGFR+?= =?us-ascii?Q?zR2k7YIEjYw7p8IJ/fsBnyn9mxFt07sAtLlouIs3gLYzEo2dNyPN63XjeU98?= =?us-ascii?Q?vSNnLV1Jb491ZP9y2nR23vVXbrgMRXMZ9dMF0zGxAMU+UcwPi3NjdhAuywPF?= =?us-ascii?Q?jpacGHXKTZKMhWmeAeQDiuvZaSSCpoj37Fgdtb8FA7mImpNuiqZCjRqWDe44?= =?us-ascii?Q?R1qpTV6twkccqRJhbYA8z0Chaa64h0mMPOZValJiXZkDV+HjLhqGzuxx87JX?= =?us-ascii?Q?ld4VhPUGqE05XgcBRbmbTvfxVo4qnk0kZ0rQVO4vXRo5EM4g6pw31yg5Xe65?= =?us-ascii?Q?e/QH7LP8/djCMVMB7XnJsZ0wzTBtNpndaWFjI4zbT+nLMKFuZtJb0k+FfHWH?= =?us-ascii?Q?VysJWaylr4mC3xFqdG7cSVbGUZgbOWFKa3KFc7F6FsR7Lpc8b0/62cGWGiyW?= =?us-ascii?Q?7pxrcoN5kO4D9sEf+LS9IC9LQNT8tFqXtBcdqtiwSaUQcHtUv0iaoPR9wM+5?= =?us-ascii?Q?1wIEQii/buvK+gY5+6QD0mzaBJaeGLfDbaLz+hJ0y++0lQta0fpaPP2M/rRs?= =?us-ascii?Q?N3QvNyWnb9/LL9uA+M1l76qNFaPPDua65rWlRF/ygleBFEwAexG6YRRM53u1?= =?us-ascii?Q?4UQ11Jy+WTBssX0VDs8IaKPN3mfByHHHDxj4VPLyHh2OTVr90QuSYSf+S7E5?= =?us-ascii?Q?GCJ8TD/BZteAZZPpEXOve1dhHSnsNoYvXQeRBvMmSQqfMJnU5uPZ/Fc0CNcH?= =?us-ascii?Q?GoSc8tEkcDYlzVsDWn/nGOEZYZOTFvfx+oXTsPnT1oij2h4gtZfSciPuRPXo?= =?us-ascii?Q?ro2bipe+HiklcwisvZvnk1S49+yEDXmQY7bNqMTg9r7pgon2odHGTiuaEnyD?= =?us-ascii?Q?wmkuFBINor5/ndD061kIq+zwbhwWwvx0DaMyFJOL395Ve8QDXmdto19hwSqf?= =?us-ascii?Q?8CsdCbCCa3MWk5qlissb6whDbXh3jipuVcGbhMED?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 272ce60c-291d-413b-2652-08dddbf58dd9 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2025 12:16:25.1354 (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: rxmVWT55vzt4CI85JwcCbohXwEnH64ZXJ6zmVe7VyqtH80y2d6xvj3BoLn7f+XV8+AhRuVXDnDwirEWuo1llXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6896 Content-Type: text/plain; charset="utf-8" Use min_t() to reduce the code in bfa_fcs_rport_update() and bfa_sgpg_mfree(), and improve readability. Signed-off-by: Qianfeng Rong --- drivers/scsi/bfa/bfa_fcs_rport.c | 8 +++----- drivers/scsi/bfa/bfa_svc.c | 5 +---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/bfa/bfa_fcs_rport.c b/drivers/scsi/bfa/bfa_fcs_rp= ort.c index d4bde9bbe75b..77dc7aaf5985 100644 --- a/drivers/scsi/bfa/bfa_fcs_rport.c +++ b/drivers/scsi/bfa/bfa_fcs_rport.c @@ -11,7 +11,6 @@ /* * rport.c Remote port implementation. */ - #include "bfad_drv.h" #include "bfad_im.h" #include "bfa_fcs.h" @@ -2555,10 +2554,9 @@ bfa_fcs_rport_update(struct bfa_fcs_rport_s *rport, = struct fc_logi_s *plogi) * - MAX receive frame size */ rport->cisc =3D plogi->csp.cisc; - if (be16_to_cpu(plogi->class3.rxsz) < be16_to_cpu(plogi->csp.rxsz)) - rport->maxfrsize =3D be16_to_cpu(plogi->class3.rxsz); - else - rport->maxfrsize =3D be16_to_cpu(plogi->csp.rxsz); + rport->maxfrsize =3D min_t(typeof(rport->maxfrsize), + be16_to_cpu(plogi->class3.rxsz), + be16_to_cpu(plogi->csp.rxsz)); =20 bfa_trc(port->fcs, be16_to_cpu(plogi->csp.bbcred)); bfa_trc(port->fcs, port->fabric->bb_credit); diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c index df33afaaa673..2570793aae7f 100644 --- a/drivers/scsi/bfa/bfa_svc.c +++ b/drivers/scsi/bfa/bfa_svc.c @@ -5202,10 +5202,7 @@ bfa_sgpg_mfree(struct bfa_s *bfa, struct list_head *= sgpg_q, int nsgpg) */ do { wqe =3D bfa_q_first(&mod->sgpg_wait_q); - if (mod->free_sgpgs < wqe->nsgpg) - nsgpg =3D mod->free_sgpgs; - else - nsgpg =3D wqe->nsgpg; + nsgpg =3D min_t(int, mod->free_sgpgs, wqe->nsgpg); bfa_sgpg_malloc(bfa, &wqe->sgpg_q, nsgpg); wqe->nsgpg -=3D nsgpg; if (wqe->nsgpg =3D=3D 0) { --=20 2.34.1 From nobody Sat Oct 4 14:16:58 2025 Received: from TYPPR03CU001.outbound.protection.outlook.com (mail-japaneastazon11012047.outbound.protection.outlook.com [52.101.126.47]) (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 539C23009D8; Fri, 15 Aug 2025 12:16:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.126.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260190; cv=fail; b=Tw/KPQWCQ/jGI3VSqgkB63GGETxAwW3bo/WmZV9I8RmIeS8gVXDqPTQE4jzr5pWhb81coplGwkXRrnJs6sd0Gh6XHYNGHEW5tBSAfEA8HF2CE7mP8g6qsnLnhcsUGS21NuD5vOH77xOlugTc6OpRFkSXXGOEPVUM7ZWsB22gkyk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260190; c=relaxed/simple; bh=k7JKhxtIqZc4mqaco10lg27fe151cGWsaK7Aaud3zzk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=TwI4LSc2rOeUGDJCTVD2n9GDurZ0ypdVH3QKnc937ereQbzRycW1Ag8qQNU1BanpRPCGAgnh3GCSUGVhResppLEJA6BhEwbHo9c1oFBvTt6abSmpPQUNMtctLidNcoUEqtMONmNMxw4axGYueowWti/tXD3l4NMq2ol/So/82DE= 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=XjcOAUEl; arc=fail smtp.client-ip=52.101.126.47 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="XjcOAUEl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FImlKqQfnL3XyOpqVYo4O3hUQb6YNAX2nxuHZ+58PSUgGJ2Cw29qJK0I/GE8J8iv0Sz3+XKLGndYdnl15OWI5okyd3MZKOzLf29aFqnBG6JNEIyteKaurkHKnhvhpd/SBHNn+FoLC1IhMJjo9j5hsvzgxCBGekwjHVjclXwKvEGZN3dEzY3Mr/ybqNg6bP/wP0tYZ7zgXfgZ6Xir/Sj9l1NTDO/z5sP1fU7ohYL7+iceOAJfJWhMJrQijWbGl2pbBS/Nxsj1K4TaL7/lmHCFikrnPbvmWQ9DFlJ4U+TUsQd8PblLLGpIbEOnUQ3VG7kLKRvYsqlp0Sw6lBmeGLWT9Q== 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=XnuKLl5DtKbNyDxj8CQc249+GrBYEbn3yZOXxv1WO3g=; b=ERVD30dZ1Q+bnb0eMnkeO37gciCyXYzs++nonLIIGFf4b518HT9r2SXiqv8Qia4p9EwYc5JdBEVEp+eKVdaB57aXpxH3Zc2wOk/4IlCyHe/GqNF1Fu8AhHz9giAp00dy3p+bcu+39P3GaMjwGwHvtVujKMOpm4N01RvmU9Ni4lO0Exg+oNLs86twG1n6bj0+x3GLf1NrxXNFM1mFIf6C0TYus5LaPIlRVC0ppNaqAirQlAusalBmginTZx7gnzIK90Oeyyjwz38QNebhiAV1+pRKrCnbiPeFtoXjC1UN88kmaXCg30XWxdwMXZVLp0j48JcSpTusUWuYiShLCJg+Vg== 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=XnuKLl5DtKbNyDxj8CQc249+GrBYEbn3yZOXxv1WO3g=; b=XjcOAUEll2yTGfdtwmOLncJt6ElUoB5OxkxLQ4xTuffJ3FRTfO6kJ3qCASW8NB8agLx2aUlBsX3/ihQhyIzDkSHvqD7yyHHU5E86vP53Edz9kaaTrHPmTHepmifftfkgml/KwrQLWvZ9Mg/EuK3aHLENuzsZUtvnAz0So9niQdRR6Nsg0M0dLPBbXnyZlpxVg+FI3c1rXDVkn/U/pukyMP+0fRnyB1hPHNldIEJmTV+dbiTuit6CY0yWrgvvio/EsilagP4d8gbtkQ0i5ycAFBAjQqLgYguVMmiDxFlLPmxuLCVP6/8Ym6yp79iN5EtCZ3XLt1gb+J/AcbIhmZsALQ== 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 TYZPR06MB6896.apcprd06.prod.outlook.com (2603:1096:405:22::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.18; Fri, 15 Aug 2025 12:16:27 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%5]) with mapi id 15.20.9031.014; Fri, 15 Aug 2025 12:16:27 +0000 From: Qianfeng Rong To: Don Brace , "James E.J. Bottomley" , "Martin K. Petersen" , storagedev@microchip.com (open list:HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)), linux-scsi@vger.kernel.org (open list:HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 2/6] scsi: hpsa: use min()/min_t() to improve code Date: Fri, 15 Aug 2025 20:16:04 +0800 Message-Id: <20250815121609.384914-3-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250815121609.384914-1-rongqianfeng@vivo.com> References: <20250815121609.384914-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0196.jpnprd01.prod.outlook.com (2603:1096:404:29::16) 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_|TYZPR06MB6896:EE_ X-MS-Office365-Filtering-Correlation-Id: 69d0535a-4106-4426-fc8e-08dddbf58f69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|366016|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6I34Rxh8VWXhSCXeXNlEUsS9SHygmqAUK5/NEjpw8nrKT07filDj+bXSRlsE?= =?us-ascii?Q?LIMR++se1ZZmL9RcZpTk0F4LhEtKxy+JVGPXvEIqBjYQAwwrOT51WgbtESUr?= =?us-ascii?Q?0KqCNfQN+wJeemDvLaFRpwP4kGJAVbjzXfbKIM6NA9N2V6WXRVZfqUKPnApY?= =?us-ascii?Q?Yy3SoOvTnP10qbcfthcGE7kJtDD8EhdW6o4uADaHZXuOsHZZxfK/mvMeAgi5?= =?us-ascii?Q?mDclIWYP86M7qQf2EbaBX+A5RKjX7BTBuNUpdACl+kqedkDstbDK7+DmaPRo?= =?us-ascii?Q?vSa0u0wiueh+BPDs+KSfViN/cid3qiWdWHU8qBUAbCU4eB7W0wIfE0QkFEO6?= =?us-ascii?Q?7qbMbKMwBDY6A8Hhb5tke716U+XBP36LDxxIWOkTvGwmAHPKhOWxc3DdVexO?= =?us-ascii?Q?+JlG+3OAqui+NSSEzmRIAtgaax40Iq6Y/g8FlRHkcwDeSSVE6TRapeXYrdmG?= =?us-ascii?Q?VvQXKlumNiHTZ6VUCVqc3wnw+BcGNL8zLX0VrofsE0gALugSLFZAljInUh9T?= =?us-ascii?Q?az1pdQ/10Vkm7MAgBUH8wMt1zMC+Qod5ROYjizGm6chgbvcDvZVDSSmyO+/3?= =?us-ascii?Q?XuXIbsbySW1D0T39PrcT+Afayz1AhXWj7O/eroU7ZMD9i/QZiZDmJc7LiqkJ?= =?us-ascii?Q?PJDrBRinvQ2GUYJGgJUaX+VmISFHOaCSu7exOh+iqtukiVZhZOzzK4jUBK3Q?= =?us-ascii?Q?9QkxGu3fvAt7i+JjSmZoXkhsO9JdKoSPiKGrxgZE51ckt4PxRPjupbcfaDRn?= =?us-ascii?Q?nUvQc8vM25e5DHSah1YQBBh3bJ5BP3Y8NbyrcmEbi/kTxKAhlqMnjMYDXkN9?= =?us-ascii?Q?SeJpFdOn20vgNBibAOK3tsXhQ9ljstVaFLZOS+fxOVFTY5EB+KSxlZyYXj/V?= =?us-ascii?Q?uzLqNQwyN50tJX0rbMArGCR7OHW3Gt5YxbEpKV7Z7BqYxynDuCsFPIOd9xet?= =?us-ascii?Q?1U0nKOms7KuB/A7QPt00FXDzXW6ay0BwvDZPIu8b76L3prHJ8X+XJhCx/iBv?= =?us-ascii?Q?ur0fBloxbF2BcnNTnM4c4XvQ85FoXiS2qfWuaV9evvEEeL6v26u33W6jLJsT?= =?us-ascii?Q?sggYaRry3C270OHE5RXmIE6/UUdHgpV52U3RpdTzDXuyJ+HCeK9k6PVytuPa?= =?us-ascii?Q?mtYLYlscB7WWZ1Nqsiy53wfnxmvr+iZgl2JYyURizbgoBQLZGK014R+delI0?= =?us-ascii?Q?o8oevXevf5F0BzyWD5gP+F0iVr9Tw2AEWBhHOakUM+QE3lVnfyZQc04imqmf?= =?us-ascii?Q?ryPpzHN4IzdJH5i7kqLWbO2DpyMb6NuIDJ/pHUmPa8jM83HlMWrAlmd7NAlv?= =?us-ascii?Q?z/TIQrSQ2SoqtGJyAOEPbINxDMcno3HhyFndXzeJ7o35SHpXDj8z2lKJVdLL?= =?us-ascii?Q?wNUIZypoOyKg7DAokKayFH9qJ1AIumqDqKas95+CMXR94Ih4RhhvAT51Q6Re?= =?us-ascii?Q?EOt1jLomV6RwcUviyjBmx456jY9J/GErxAvRIPf1p6foLT9nnLBg+g=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)(366016)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Oh760LzVky2Y1DoMhaaDZzLaS6ALIk8iGsKFk6npZMRwApU+9hATPzOK4o57?= =?us-ascii?Q?PE7bjWDue1DiNi8cflhEJt40LXMSqXwAq2X/hgF1sc+uwR+jK182wQQYXk/R?= =?us-ascii?Q?b/mRmGzONOKUDfGtGqlkD82rijtYlMSyUe+2JOzh20f+c4EWZ2q05CLDBtKf?= =?us-ascii?Q?+fksBY5kaxXtYrDVdwVRQelt0j9ALC0qfjPmwD1jI8eZZiLjXfxa+Oq8erix?= =?us-ascii?Q?+l2wf9QQZhz+13/IJPHqzEraugODGfpsa+vqTuHBYVf0rE6x8mB6nR2X86wY?= =?us-ascii?Q?5ItR/QRFEET0qB1DAk16c52IU4bp8nMcnWJiZ48Y7tyQxb2e+qQTMiqN7xH5?= =?us-ascii?Q?Whjph8F8keNC351D70nQlHgydmljN0zPI5v0Dl8JgrRDi/7fY+eJ7JMwL1Il?= =?us-ascii?Q?vWsApON8GFvsQKFxi3456AFWJT7LoQfCwCgfUPTn2rST8FE/SE3bFMzP5As7?= =?us-ascii?Q?eYclgParSqiHN4RBXYj6bGqfR7G8WIqBA7W3UcqSAQA8F8uSGMOd5KArPE35?= =?us-ascii?Q?6kKgoTA+bquXunwG1VmNTf+339Y4G0k5FmwM7qWLkcjpbPxBlSzsGxVPBfLd?= =?us-ascii?Q?MGyv3fu0RoxLZPzwfpGXCnoxpz+eOIeEzYiN6mdsqyIsXI3f1bNSfjg8xsL2?= =?us-ascii?Q?nsELBuEBLy09qUdnRdmEeaq4DcfniDgRNCxdgTWhlf9Rf8x+vx6MABUysfbN?= =?us-ascii?Q?imZBXjGj4w6q0qf1ivcd//FwXt6/fueY0zpa7O2xAULblH83SfDUO+9epksU?= =?us-ascii?Q?ZRA9Ai4xbgNpxKpRbQaMqd6LX+Yp0mduDIkH0YuvwA0JBhawq2OcFS0aDAbS?= =?us-ascii?Q?wNwjMItE6cBb/XabpdZNVcslKVsT/C/ngz3bFnbtjEClFc8EPhJOevKE1THz?= =?us-ascii?Q?06bWPKODyKPGYJJrBGgiEMLMoMzuxpavO9LxG6oNniaoBjCTxtYp4NjPW7VR?= =?us-ascii?Q?qfFq4mc4oxKbbUBlrsDDPZ6NsAcSw3cs4o2qfstBjuRfmvm2ZfX4fVgNnmT2?= =?us-ascii?Q?NHiEz6h0dOf9vB08wh+wulvsS0PlcwrSagqrTFBSJJtqGRIKIUmdz5TvrP7O?= =?us-ascii?Q?oJm2MR8icnK3WdgV+QZobylpRG3l1gwTM3aAYe/KbcoorAOF3z+WsjrjyWQd?= =?us-ascii?Q?2t2PPx0HCE/xSz1PPQGpIktbc7/faOsEL1ALKmH/+FIQL13/1woaJ+/ac5SG?= =?us-ascii?Q?/kilEulmaH/AI880+1X5gesB+aYRP3VPFF8R40xGtvR+6oEhxWfDNRNjRamv?= =?us-ascii?Q?c8Ke/RI8a+T2IIpfg4vzLplTyRRfiOAaZjorLCk2lBbvytoUIbmVeKTcXQGM?= =?us-ascii?Q?G82zDFFZHDDyg4y1x1cyD4T4+8ND4PLEUHbwWwc5ilCAkhaC9eW9YGYxXwEj?= =?us-ascii?Q?D7VhRReorTDYofvPrWCfTktX/IzrRYGWsyNjcNlMrS3+o7m3UdtsXYdEg7AY?= =?us-ascii?Q?TOH9eoPKUuuZlBGfOgzJj7N8fIyQl3wcTTgNVmkJY6d3kA6Jpavxe9LPL+o5?= =?us-ascii?Q?SEZ1eq96lb2Zu6IkWJGkp1NGVO5aDnaYpIQ+5LjOTP9JZRAe4sEr5jmoLia0?= =?us-ascii?Q?b1do8Fa3fFLjHjvcU3pvgLl0xQGzmo7KhiTnMqFP?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69d0535a-4106-4426-fc8e-08dddbf58f69 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2025 12:16:27.8251 (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: LVkaaXtf9rJyhpjwIvz8lO9Nup/QenAf7/fkmuB8aD26ZuYjsCjnoFQCVrz8c2InmxNHLgiPuclOdHM9LZKVeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6896 Content-Type: text/plain; charset="utf-8" Use min()/min_t() to reduce the code in complete_scsi_command() and hpsa_vpd_page_supported(), and improve readability. Signed-off-by: Qianfeng Rong --- drivers/scsi/hpsa.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index c73a71ac3c29..95dfcbac997f 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -2662,10 +2662,8 @@ static void complete_scsi_command(struct CommandList= *cp) case CMD_TARGET_STATUS: cmd->result |=3D ei->ScsiStatus; /* copy the sense data */ - if (SCSI_SENSE_BUFFERSIZE < sizeof(ei->SenseInfo)) - sense_data_size =3D SCSI_SENSE_BUFFERSIZE; - else - sense_data_size =3D sizeof(ei->SenseInfo); + sense_data_size =3D min_t(unsigned long, SCSI_SENSE_BUFFERSIZE, + sizeof(ei->SenseInfo)); if (ei->SenseLen < sense_data_size) sense_data_size =3D ei->SenseLen; memcpy(cmd->sense_buffer, ei->SenseInfo, sense_data_size); @@ -3628,10 +3626,7 @@ static bool hpsa_vpd_page_supported(struct ctlr_info= *h, if (rc !=3D 0) goto exit_unsupported; pages =3D buf[3]; - if ((pages + HPSA_VPD_HEADER_SZ) <=3D 255) - bufsize =3D pages + HPSA_VPD_HEADER_SZ; - else - bufsize =3D 255; + bufsize =3D min(pages + HPSA_VPD_HEADER_SZ, 255); =20 /* Get the whole VPD page list */ rc =3D hpsa_scsi_do_inquiry(h, scsi3addr, --=20 2.34.1 From nobody Sat Oct 4 14:16:58 2025 Received: from OS8PR02CU002.outbound.protection.outlook.com (mail-japanwestazon11012029.outbound.protection.outlook.com [40.107.75.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 B3F633019A1; Fri, 15 Aug 2025 12:16:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.75.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260194; cv=fail; b=FGl5yRPhwPwNlC4nglpTV/055QxK34o7oWUcgQ+0Z1RTtICgeL9N314ueKr9H4T3bXcB6pojjRtPVu8CI650xHb98Q64R87o8iokRpcPhlWejLE9c6mtTglaNSUR6463gS56P60LHP+bL5cwh5yPAHtNUVWenFOEvRZyI4YgT4o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260194; c=relaxed/simple; bh=1qzZEKd4ZQhYGcrFjm12p76yHt/O2nl00J4Sr+OWHM4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=YKbiEXxHQ+h6uagDygbuCYx6kCAGGIBICS7i4qR7yVTR+isZrRyOZ873o0xB9cQOlEmSFQdJNMjg218D1p0Ul7i2O+g/P90popUEQyDQW5XinDY9NxCmoV/p2tubjeTNrxFkoJse00uhJTTJSBOHkiMGPTFryT48AKW86axeyfo= 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=ouPRbU0r; arc=fail smtp.client-ip=40.107.75.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="ouPRbU0r" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Zjzb7mZFhMg5Pv5hTgwspl32/5Ksalqu41zidFTp4Rzi+B62G7YnrKeFadRY8eeZoc5dxNiHL4nAXta1FUyuQIp8o9I/UNgq6Ja5g8H6abE637SO0rQSsC/UcvsPozTgI/K1y8qXaYh6TaSsaf6DgFneRv8idgF0KJEWmlfgimWKzHTgGTYFIwQCls5qk9P0ioZJYzvptuDypD71qzggL3OA3iS03+yc3mZvik4tEawGNYJ8l2+GfVAl0jDgUvi7iu6qtWY4l9MmL00EFUZJAosbrYrDlaqmlguvORjr0CoFUck5R5aIsD+vu96AqWheVKPRRy/DwD3g8GEY/EDChw== 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=XHrZmaDlEPNr/1o5+bJYCW6Wh5hekl4VK9ggnWEQr7o=; b=gViu2aKUvMggXbaG46dEBkLgLWsg39+P73EMRJjR9VA9klCc9HkKqmII/kFAqrNwFhu35KDjMDqnk10+1jm0jzIOmaSKwHmEJX0ZSNUxChSD+ddehl84GTv6OoRWqE1Y+tMdBmL64ge5N/4rAPyhxbdNR6a/tynF7sT5fZxs9zr5Iidt1v+eD6TE4E3FvUERR63WxoM8Hq7FToVSFSjAhqO50v8/B8PEwkkelK4o0M/QNGqQvMU2cN5f7TA/D2QO3Dc25JRi6eu6R0UaQr/eqVzBZtRKtAA5o8mo7SlXEG3tdWQp/mRixxitUxqX4SiR9W6YohaqpFsQqh2U0ZKnmQ== 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=XHrZmaDlEPNr/1o5+bJYCW6Wh5hekl4VK9ggnWEQr7o=; b=ouPRbU0rcTGeg59Fv7+igPUyMvJWFpaGGSX3PB8t4y30xMswQQN8okam9+Wq7pO6SLAp42Cywc5rjhGxNmD9pAX7IjlWYVrD4FfFpBkLseJzkz1EfurS8Vo6kGnJpvdhP1JVIb4/MxfA2LXEFcIkKHArzC+CfHUTY2WamoKpZxpWSFtL+bw+dzdzJGRVFGrYNRapqKa4nfNOd8hEM2edhnny3j+BZq7gqTMmb3ew/xw7XweVO7V+apuyKVrfJz6hCfv83DLYrKYD4YkAoelo0kbXdxRP4StQCwAs/aKonX5TRJhgmceTuTl7wxKLdgrfw97FJvGHqc5T00M/hOaMxA== 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 TYZPR06MB6896.apcprd06.prod.outlook.com (2603:1096:405:22::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.18; Fri, 15 Aug 2025 12:16:30 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%5]) with mapi id 15.20.9031.014; Fri, 15 Aug 2025 12:16:30 +0000 From: Qianfeng Rong To: James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org (open list:EMULEX/BROADCOM LPFC FC/FCOE SCSI DRIVER), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 3/6] scsi: lpfc: use min() to improve code Date: Fri, 15 Aug 2025 20:16:05 +0800 Message-Id: <20250815121609.384914-4-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250815121609.384914-1-rongqianfeng@vivo.com> References: <20250815121609.384914-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0196.jpnprd01.prod.outlook.com (2603:1096:404:29::16) 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_|TYZPR06MB6896:EE_ X-MS-Office365-Filtering-Correlation-Id: 91f80395-88ec-4dde-8e4d-08dddbf590f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|366016|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?aCHTfVDcYDg7wT+6kZf/tZISvJxeNpXfv4tSWUcKP9cNdu99Kia9kIZGrxd9?= =?us-ascii?Q?49fFrh054h91JzcJ9uy3zXdi3E7u5py5O1a+IKvA2gFcg+wDIX0JmrzC2KXa?= =?us-ascii?Q?otPZK3yifYUBpmPEYmYoQCcAJftPw2CgBBKg5rEdK0GJxB/xZBdhoBfmsZAM?= =?us-ascii?Q?nZlXJlvSxeASbqzoqgaV0CT8QqdeFJV1YObjmcpnB74zBUYewYtXVvoXh8fY?= =?us-ascii?Q?JuN1717jOZzWko4aOIhUULdBHLW2+ZbYtpL5gmJ6MHD8Ig2xh4wb6ZUDyok3?= =?us-ascii?Q?bODe1q45JahJBMFwnOniTMQlLl3Iyic6zn+robdxcE6rci857/Ft+ZK9s2W1?= =?us-ascii?Q?qUm6JMTUIdxHaNQhEhqpDg5oQK+b+NySQt1Agm5zePp/3YiG+DEDiwXV2L01?= =?us-ascii?Q?xsFrO824xfm0PSIIUkLsdOl1n9LaEMcLz5ggupfzy4ah0X620RYeUw8O75vq?= =?us-ascii?Q?ebNMLRzzA+8Wlk9UAX9LweEGMWMyo3lsJGRnr+Mpj7fJzzd+J9fL2p6gLxe7?= =?us-ascii?Q?h7MP5b3QQedgcXKBUXJS4T7DAR/Rce+I8TXgmYcVJxWxh2BZSTUCz9Llzu3R?= =?us-ascii?Q?KEmD9Qmnp5wP2Ns+mSfH80dxn0GdvXnskOi33Y+QHJjCDFd6EDhsMWvgGxOh?= =?us-ascii?Q?/QJ4QmtryqXXCehSl4cgblfvcpxxDoYIqVoNLDPrqt6rGAn7y5IzHUtjORQt?= =?us-ascii?Q?DScAGNQvgfYAERRutzRe3+JT0nDN4hfWCGTDAI0tgrawogKicvVu7JAxTup2?= =?us-ascii?Q?oLyFqdI3yIs9uqlcA+ZGvvQFnWmp4E6zpJxnN87q+HidvUjwh/gO3gkrgxmw?= =?us-ascii?Q?/Sdcpk5qbDnem7udsr2FevhbT4zO0H2jMTpznh0zj6cOlUz14SukxIfyiYhQ?= =?us-ascii?Q?Zu2DHhKuh1SLItWZLgL8El5+J5cbFmrxzq10CVF6fPiaTeHZrjkBbgS609B4?= =?us-ascii?Q?qCS4/7ymf+ml7fzMTswklz1hbdwEuHos1Ie5uz3VKR7qidZcaYR4GTl8Qnmf?= =?us-ascii?Q?uNrCLE9ItREJQrmWBfqxH/xrDScUQhy74zMBcBuFq6lEoyBcWmX4LbCAaGCS?= =?us-ascii?Q?x3lwg54+am7muH6C+Wwe6/VFChXMuDT//vXL6qmoJdX1KMV6FOPCTEA0019b?= =?us-ascii?Q?MDwl7Y9eMLjQONrMTin14M270jWUKOjSu2pkMTxXQ1TusNcVEjKC43K+Lynp?= =?us-ascii?Q?i7P3vppKFophRFY+O7y+dx7dIe6+IF4kotSulnJI3XhTYvzn69n8b6YFvGAZ?= =?us-ascii?Q?7SxYqYpy7tQ7GDAiDb/2G5HFclbHM+1WpHZTbq98dKrDRQXsjyd+wdole5Ij?= =?us-ascii?Q?R2AkxzyHPfMtNhKpmnTg/k8+VDUdgdTql05N0PsU6VcGT6359QrnKE79EU7v?= =?us-ascii?Q?/wyclVpbDz+NKwGpGGqA2Yo+GeZUpcqtBx7gi9t5tJcTQUt/FnRO62qKGlPh?= =?us-ascii?Q?AEEdslTUaKQOVicmUOXbhXB79R5CmMVpoiqPTXhZQJDQ8ZM0S1LlVg=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)(366016)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JvZCECpUZOyguaGOnr5cTaBA5mkxIhVAqszMH3TaDPPWj1da9ZZP8WP2JUVz?= =?us-ascii?Q?W8x31VzSepxvl8QhA7MSlqzmeH68g16/jWSwo9eFMZC1YNzxpKL8b3TdX85h?= =?us-ascii?Q?quUqOsKuUDWsdVkHErr2Gap6qjay2MH5t90fD2S5sa+s0ZQhLTum4qH79DVE?= =?us-ascii?Q?ggPqBciHnzEjpsNRMdi+/ljEVZwdz9Iz94gi5gU21MStRw4xo8VsluXFT1Gj?= =?us-ascii?Q?zfjPZdhlaSBZnT/lZIiJEZUVT4pJ+1Xa0p1YWfp1JGJnvaqPluAzJgH4IkI9?= =?us-ascii?Q?RBxsvTawnyiky4tdUQTnRqHSQyHKhQON+9/MGh0Nwlmm/Qen6Gt3EaVqJj0L?= =?us-ascii?Q?9DLKMCK//4rzHZkFaxOyFjX0Q+ieDzzlX4mx/vfiSLo1xOCWIwJEIMkh6g4J?= =?us-ascii?Q?0/rnHOOfNp0hQeZ7c/Skxx/yriirzU7Zlbz7+IASYYU1RfNU4081h5L6h1Lr?= =?us-ascii?Q?j81VyTuiNE3m62rb0osnaf5b14lf5yFL4l0cnjD7Ks6+DroiqEJb/38gwk2S?= =?us-ascii?Q?wFgDaoe5xKpapuuSfsOHpesdOWuldjB1wkna7s7m4k+bIxOHvpaVWeAyKWB5?= =?us-ascii?Q?6ppnfj5D4JFbZV9OiBKLMOQZD1+f0mAmknDpBaaRek6GQfa9GLv/e8CASyiC?= =?us-ascii?Q?KABE7DvwyKlbnJHZbcHKr/DzgcTTmdROMJRZs6BLOLtKGKlnTxfNjwDSwEwV?= =?us-ascii?Q?xCDzYem9o0rRJGKwuk6E6YS5zr8imPtqqid4YOcNkBLG82cD4s+6s+fEHrOR?= =?us-ascii?Q?AGUDR/NrCIi9qlluXKGKzetlSyiEd8L5zbaLuqnfJroYPCbfoNU9pY3uMVOH?= =?us-ascii?Q?VoNOlS4zyf+lmKJ9XNlVtKokc7Ab0OCS2lxRgdSI2FdJ6VyibNjjIkz94UeS?= =?us-ascii?Q?8/SocTyvBNXzqD/FVd4bsb2ZL0OSkxX2Syt3bTW3drpbOPhRTergAepE2Mwl?= =?us-ascii?Q?t1r3sy2y8JbFB5FLdWsgZFE37yD25mFv6XQZHzN1i1kxvSARfy24zbFxN7aQ?= =?us-ascii?Q?aS6XkyaUBd4QckStNmiNBbo5n5e3YttbuKJFuO4SVrw4WcZbZr8sBQG9mJ9q?= =?us-ascii?Q?eeHyjH6n2h6PHVjs1h8epKxPkMzJhsyC9f3khWtxjCjaP6iDpJBXR4NJJaDP?= =?us-ascii?Q?4lK9H8U5btw9ZA2O8b/pHTXWwRvnbAX8qtrHL0s/xF8KLihE3iaMtttELAmi?= =?us-ascii?Q?I9h4JiWYI9rOp70GvTtbDJkpX/1o0jks5VwVU4MnuGxm7AtJdAKj5HoIamUT?= =?us-ascii?Q?AOz/EGzpei9JGlBkRONcpyRsXmoNAumV6a6SbzhJhwm4mazKsLRIZmCUkbhL?= =?us-ascii?Q?NIkBBA9SK4gFQfIMN/h/miFfVQc/DUlJb/7ArmhRpuorKNwptKw9k2EFYVHv?= =?us-ascii?Q?ADelW1hT8CHRGSX5csR5ogoSe/gERwO+xfsn8jCxpYOnZ6BShCORbCFcEU7Z?= =?us-ascii?Q?LfaJTau5JdkZYmRPP36ZaJVFErA55MfPPzIXVjwT5v+asB9OiJyOrHoybJzF?= =?us-ascii?Q?pofvqKcqHmTqRxbz3DH5d3E6SttDPSSzvKluRyTZhvu7tBU55clqLFCVnMhP?= =?us-ascii?Q?WUoxCdcjUy11gMwoCnxWzKzhSeKZY5dMgfaNtKse?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91f80395-88ec-4dde-8e4d-08dddbf590f9 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2025 12:16:30.3503 (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: 1KCCYR0kaNsE91TOr2jeo3grOCjmQydyVBF2NejH4Mepaf7MBpVKmjrM8f04DfefY7TUMU2nkSYyUldIjQF0qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6896 Content-Type: text/plain; charset="utf-8" Use min_t() to reduce the code in lpfc_sli4_driver_resource_setup() and lpfc_nvme_prep_io_cmd(), and improve readability. Signed-off-by: Qianfeng Rong Reviewed-by: Justin Tee --- drivers/scsi/lpfc/lpfc_init.c | 5 +---- drivers/scsi/lpfc/lpfc_nvme.c | 8 ++------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 4081d2a358ee..ad8a85c65bfd 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -8300,10 +8300,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phb= a) phba->cfg_total_seg_cnt, phba->cfg_scsi_seg_cnt, phba->cfg_nvme_seg_cnt); =20 - if (phba->cfg_sg_dma_buf_size < SLI4_PAGE_SIZE) - i =3D phba->cfg_sg_dma_buf_size; - else - i =3D SLI4_PAGE_SIZE; + i =3D min(phba->cfg_sg_dma_buf_size, SLI4_PAGE_SIZE); =20 phba->lpfc_sg_dma_buf_pool =3D dma_pool_create("lpfc_sg_dma_buf_pool", diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c index a6647dd360d1..e6f632521cff 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c @@ -1234,12 +1234,8 @@ lpfc_nvme_prep_io_cmd(struct lpfc_vport *vport, if ((phba->cfg_nvme_enable_fb) && test_bit(NLP_FIRSTBURST, &pnode->nlp_flag)) { req_len =3D lpfc_ncmd->nvmeCmd->payload_length; - if (req_len < pnode->nvme_fb_size) - wqe->fcp_iwrite.initial_xfer_len =3D - req_len; - else - wqe->fcp_iwrite.initial_xfer_len =3D - pnode->nvme_fb_size; + wqe->fcp_iwrite.initial_xfer_len =3D min(req_len, + pnode->nvme_fb_size); } else { wqe->fcp_iwrite.initial_xfer_len =3D 0; } --=20 2.34.1 From nobody Sat Oct 4 14:16:58 2025 Received: from TYPPR03CU001.outbound.protection.outlook.com (mail-japaneastazon11012033.outbound.protection.outlook.com [52.101.126.33]) (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 112243019DB; Fri, 15 Aug 2025 12:16:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.126.33 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260197; cv=fail; b=LuiyOsdUBbGLO39in7K+kqIpFRduHxcQFzpnIM3+EIt37aoPzkVGiWg7mFmYqLq2Qsw8OYut8VaqBYgQUlWU2p1T4gKVyjMbOwxj603zqCMND8HK686KrwWE20W95jgHK38ZLO6+lqi34jctF2fsC5XyaE/ni5xU6rDba4ouPpA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260197; c=relaxed/simple; bh=JYRx+xr9AwFTr0aKo/FRepI/OOrBVJbn7ODeswm9840=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=KITqnzqoPYUvtF050i20qvDgLgIw5spAK9xkyLW3glwqe8s4nqVv6+DrmAveb2XYr7KzXMd7AcWY3cb447vBsNK0SI3bSeMYTQGDFnw3NVGkRL59Fk77fpUapHufcf7kr/piOIkXUK/8tA3xJxA3F9GP2TWBW04THcBJthhKXeQ= 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=oRAv+HRt; arc=fail smtp.client-ip=52.101.126.33 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="oRAv+HRt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i8038gX3+LV4QJa2xWyknlRiLcbRS6+0dVHlp+kZM4eurGpORAS32VbUfd5dCvemuncw79Rew4gxRJlI8VPpW1XBzVH3yhf7b+zP3l+5zZvyETQbcCV1U08jOk/I0e/5+JHM39tVkYrVwKuq1w3kMne4kzSgaIoP/ZpZg7mY8yXDaa/z38LafLNL7aENMjXLWhQSlPhC+hNqghDYF2HDHUVxyNjRgdqePBRW5SZEprxhWwb0s9U61Z1OmT2tP7yoS1fGpA5br1Z0o1b1YjacMi2NzEkv2i9bpNBHnkgxOjOGwC3LhqYEnxeEJcic5WceiIsl3JWJqyETUgnlAelF6g== 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=QdCQ7Vllhfrnu8V/eCSo+DnU5wWqPBzaP7FgjkHd5CY=; b=aaGaPelDbeNpW0/hFI1W+gBcKGeIHCoZ6mZbb0dCsnQit8so/LVIoIb+bEDHX0TjMrmZLYPbtm7AJkp3VdC01qlqSPeqbZ6w8Vkv9he1WIzWDU3NRtiMmBVuWDhUWfG6Jcg2fare+lL943jfdUIvkWZiNEfyga32HPBAFiuzLFQ7Whtz3JF/M/g89YiQPMyScyqlLPTLdhqz+MS10Ex1tm9dz+9aXzDC/QhMlgu523RTBc+TzwgdbakBgStTprFqBG8rq3brCynI/U5Xh4reIF4vPQvOhxkjWFGkQJ+9slgb3icOkG/tMak1AhQZv9mjmj2pLeGPynTyXc6RIFgySA== 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=QdCQ7Vllhfrnu8V/eCSo+DnU5wWqPBzaP7FgjkHd5CY=; b=oRAv+HRt8nGka5QllTa7xaolzYVgq+sIl5HCZDOOM/TQcE31j5scQ3Tq+q6WakGVVvvr8FR9fDkrV9fWY+UHneJZDIDJo4l1k1yRtV+R5M7ogOT0K73CUiTMr0QVZYM0SZCJteVN3n2peIbrMtL3aX/bo44B23UAwRTDWEOFki7z2tucFTqBFUhjCTwWpyh0bQbrhBUeAjdWcD9pZR5MV8XohFivcwzFopztdgMcLwY2jm+GoKiyQPCIt/fJfjJcCeQR0fzB7AV8NiI9Ss2LkpEeTVKnogiR1PVykjc/ArrqefZ+dBPn8Y8E7w50nQ8USO4uh1OcA51QLYAjDSHT8A== 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 TYZPR06MB6896.apcprd06.prod.outlook.com (2603:1096:405:22::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.18; Fri, 15 Aug 2025 12:16:33 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%5]) with mapi id 15.20.9031.014; Fri, 15 Aug 2025 12:16:33 +0000 From: Qianfeng Rong To: Kashyap Desai , Sumit Saxena , Shivasharan S , Chandrakanth patil , "James E.J. Bottomley" , "Martin K. Petersen" , megaraidlinux.pdl@broadcom.com (open list:MEGARAID SCSI/SAS DRIVERS), linux-scsi@vger.kernel.org (open list:MEGARAID SCSI/SAS DRIVERS), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 4/6] scsi: megaraid_sas: use max() to improve code Date: Fri, 15 Aug 2025 20:16:06 +0800 Message-Id: <20250815121609.384914-5-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250815121609.384914-1-rongqianfeng@vivo.com> References: <20250815121609.384914-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0196.jpnprd01.prod.outlook.com (2603:1096:404:29::16) 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_|TYZPR06MB6896:EE_ X-MS-Office365-Filtering-Correlation-Id: be8171bb-fda9-4f44-b2c1-08dddbf592a7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|366016|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9sPDPE0W8cxfDX0+K2PxrOuiKk1RfCCZdQ274LI0+xAM2wNzFq6xebrKyrBj?= =?us-ascii?Q?/Ag3e8oAWyLYk6DTfxNRZRSGBjqk5OU4+ZZD3EJwJR63sCEjWtvZDbcXrMoc?= =?us-ascii?Q?rxYfZ4HZZ40O4O4xrLO8a1HsY1ETjpRDFIkYce8TlvxY2v5XMB8ua5Y0hRlw?= =?us-ascii?Q?KyQeACyE7IdwxksEztyI8uXGWbQef8DAfFUoopitMAkUFYBq2aXqERrmRaif?= =?us-ascii?Q?qOjBMnTb0D2337yuayHoGci5xaJnfTzirasR6VxlSL6MddwAszKtdaAyQI3y?= =?us-ascii?Q?PBQbzExc4aNYQcJinHfjpiBQfYlv5/FsK0r75BVagyQZ5f9ojjqcIbFRWiwV?= =?us-ascii?Q?Xol/CgAO2q8hbYsJozLeZcpSsWwT/EkZHFI7XzJY/OXphzxJep+4DsBNFGVV?= =?us-ascii?Q?dtXsCL/1bw1Xt0ueGY08FNebi/JaOiciFzGgQcvbJjohFTApdXeFI8+qujoe?= =?us-ascii?Q?ieJcv5rPeOz9SNzHoqs+xHRsCvL36inSyEtuH/kl3DTk9qQjyjKr5W6+h+C0?= =?us-ascii?Q?f5xbKt2vpY0lbh/kANlC62m45FUYCl9jjHEEDbVyqMfIKU8csvLZctwrbrCL?= =?us-ascii?Q?5ZA4YqHawFxM98D0WN9tfVJmu6BrB9M679zVY8NkL/R3RcMDuJOcpKSYfhuT?= =?us-ascii?Q?8qITQOa1sspoSE5rZUt0TsF+T3y8wB8Iy8DTqh8WQFYqScHkFnGZn06aSDE6?= =?us-ascii?Q?emLGvzbZeCbX2rla1bJj1Gd7AEkeGM5r0GT+YZgOslgj6Pf1XiPDXKYD/olj?= =?us-ascii?Q?ZF9uDPb0A9uwR6tNVjlksbzVvWR5yXJ9pIotMSsCs5RegzuC/xrEKxVSxW5O?= =?us-ascii?Q?Q7S61VqhA7EIXdIo2oY1y1wGnmupVPh5wW3QU8Yoc5iJ+p3YR882zi0cpFbt?= =?us-ascii?Q?G89+UtZ+kM7DScrNaVMoM0DYJsphBQFIK46KurDt1hspc808tvUDdo5i/ll6?= =?us-ascii?Q?YVZx1AyIuu3ODJDbYmP+yoaUT+joZ/n6xR0igSWHXROSGGvE9hMUTelEY88U?= =?us-ascii?Q?8znFhOksOAIWnc8rMOYMelFre/NQSCoawV9sIdffkfm5bi77ToCfwuCv0DP5?= =?us-ascii?Q?/cHxv3wLcax30WuVQEmuAe0EN9Rxqbsb3ZhIz0TNrJHiJE2j5hMfxL6CsJ7T?= =?us-ascii?Q?fI3HjKMb5/dDxom7soiz5tCeXnqSAq2z3fIYfGebNO0RpMgk9mc25mCmB3ft?= =?us-ascii?Q?38aUyitnHSE909J9bwOZ/cAouhepgUUpKUQiITzSxYutDhIJP3huF7VPKyM8?= =?us-ascii?Q?XKKWcOrjMa4VoBOVldXsKeFbb856IXKd/7Atm3ms2lf/MaFY/E0w02lJThCo?= =?us-ascii?Q?fny192HgfwDFCVfxVfr5p7X0kKIk5otn5r/uFt+AHKXcWqCvgxrtEmUwaB2u?= =?us-ascii?Q?S7UNGYagBHXWv1gpkKmA0DQk5PKDhUMBpt0wKuw9GICm1O0S5ktknS9Ol0Um?= =?us-ascii?Q?95GTelsysXiTuJjJl0vvgirLtpHoqP7MVUfguI0VUJ53oWD61UM1pQ=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)(366016)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?peVuAv20PW5+wG+gdj/LZR0RTk04IJL+8irtAgRJQIvWB46v8+RtmsdX3+px?= =?us-ascii?Q?2TIche7iPTziwOe85iQOsQBcdojyV0NIcMpWH3gtkysTaK2H0QsXZJQAf/E/?= =?us-ascii?Q?Pu0XyOJWWZghlDcWuTauFBHATBqoCJxHuzjD8ICcw1yUQA+C/0c19G5udYwN?= =?us-ascii?Q?FjHLVmmQEi4P7C/1FRCFfwqgb8eq+uZ9zNY5drH1OIlPvflatF8QoxjunKBX?= =?us-ascii?Q?dRqYBU8IJfVic7sQw0cTbgYC+a2IIEnOEqkFP28Y6t6Nq2/nojsj2hWceEOI?= =?us-ascii?Q?We5rzKOqQJcbiQC0U+gf/9AYm751NfylUZJtPMbmmfXlYmyr1umGysPPu9FQ?= =?us-ascii?Q?ittZ/hA3iOwzay7CU7q9ZavkEbGoIb+7PhnG6+NZfQmvJzWi2+zI5myOAaqF?= =?us-ascii?Q?4yul9uM0kTY4Xwwm/nTwfJUtUZNXIUjmDK0q4Lz/MDKZRGIzGMro1JZSPsiL?= =?us-ascii?Q?/jaQoyEq5KUBxbhIhQveTsrOfHsk/U8M5WtH6hBQHcsTpT0iZ1B5SJCs1dDA?= =?us-ascii?Q?aEEv+9ChnCWuDIohhKcKNznaxE1f0cKvQ/J/vAZlJOuvOe2hkFufDv928UkY?= =?us-ascii?Q?57SjRFlyu8ycKAWFSIR+2j/LVU3jXhZWHv3Axd0U2S9JWiKhmgFkhwLHl9J4?= =?us-ascii?Q?vnTLYlUt5XvwoY1bBFdFMnyqMemObQ7mqv8E8Yejg2HrTlIhfkBrJJH50N/O?= =?us-ascii?Q?T/nx7iko6Iy78R6b6a0hHsD5aw8D92YtHSVh5fmmRlTDXTJ2aWq6bDNiD8CQ?= =?us-ascii?Q?uodNTGOBw60wq5KqJIiqp1npkjgCEgMfDUayx5tcaysoudp/oDGSrgu2UNgb?= =?us-ascii?Q?JiwV/36EfTMDcCtIpV1Kvxd2pg4EXpe8i/VlAfc6jwGNSvxM10bY4zdC+Bl7?= =?us-ascii?Q?RD/Xmf7EY6/X4zpzhIZ66p8LdAFvTno+/4xTQgluA3CGLB79JuUY/ISxHLeq?= =?us-ascii?Q?PH1Wva62G3mYd74a8I7QPpLWMw+MSVHrrpNmrCXAJX5QYhOV73LDmGKNcQ7S?= =?us-ascii?Q?1YV3Siu9Kj0ODwPQhmB+BKiFNEDgioI1qa3ZkaXMUwTbOtKgfEw8gYaaWyMW?= =?us-ascii?Q?1/xWpROWgcH7Eg/BK5UeWmaR3xsSuQ0TmW0Ow003jp2UJ8b6SoOmieV9XaPy?= =?us-ascii?Q?hJTfiySRX9oMqKnSHidDQYKBYrvlqYEK/VES/6YDddt+4e2rtB4SRk1D52iE?= =?us-ascii?Q?z9M8mjGrfuWJDzKejN19bd4IOYLx8lvVwFWPrbhUVGJqLdGlbT+cFGtWCE4q?= =?us-ascii?Q?B89pWAk7D+nd/fOMdqyKl6APus6dSbfsvJ0PIDAev49eMcrcHd3D0G/mB1Qf?= =?us-ascii?Q?coDBr9kMTudppgZ2Asy0Js3BsvBQPmhUjlQDq9BdsfUL5t3splvP6bkKUC5c?= =?us-ascii?Q?b3lRJQEhKn0rpv1+bM4AL/4rcsfAPtt5SHQY+q9PxAHfBgSAcwFbF1SOA/wq?= =?us-ascii?Q?7XMCXdWlQOGn30AxaoM56A5KAKkVTo2UvE1e194o5A6jCNwms1MtaVFShb8m?= =?us-ascii?Q?YiRlc+cEWdl6rm/uBkdaL5J0sl9Iunf6ySxxo7q5iO48PWifrn8Q4VtL/k6Q?= =?us-ascii?Q?GWqQsUIQU1D8aEBo39BbwWJ0sWASc1eVcvISEt0y?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: be8171bb-fda9-4f44-b2c1-08dddbf592a7 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2025 12:16:33.8224 (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: NGPpZo+fCk5mBCTcy9EjZDsiuDy/+0paIgkWH2qDhEHrkm3ZnziaM4SamztYT3amG5xber6c6TDtEp8Nf3nWIA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6896 Content-Type: text/plain; charset="utf-8" Use max() to reduce the code in megasas_alloc_irq_vectors() and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/scsi/megaraid/megaraid_sas_base.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megar= aid/megaraid_sas_base.c index 615e06fd4ee8..18ace4fff9a8 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -6004,10 +6004,7 @@ megasas_alloc_irq_vectors(struct megasas_instance *i= nstance) instance->msix_vectors - instance->iopoll_q_count, i, instance->iopoll_q_count); =20 - if (i > 0) - instance->msix_vectors =3D i; - else - instance->msix_vectors =3D 0; + instance->msix_vectors =3D max(i, 0); =20 if (instance->smp_affinity_enable) megasas_set_high_iops_queue_affinity_and_hint(instance); --=20 2.34.1 From nobody Sat Oct 4 14:16:58 2025 Received: from TYPPR03CU001.outbound.protection.outlook.com (mail-japaneastazon11012021.outbound.protection.outlook.com [52.101.126.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 AD6CC302778; Fri, 15 Aug 2025 12:16:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.126.21 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260200; cv=fail; b=QD5SKVJVw55GRqgpTxTaII8XRvq6Q89bsd/s2kVU7gyXzjW0vUgq3OhA6/DtyHYCCyW6/7rqJ9q+O2hCKrj5m8obT2U6FP1xJAO305wUPVAMUPuGn6+upAqld2J4gqz2w30VwjZNi+AD3HucLe6Cwqk5MbpXHRVxnBw2zDLc+mY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260200; c=relaxed/simple; bh=At3NFxec2JPREj2q0+aKalXLXh6P0dXbH/qKPwQvYqI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=XgKsqNG9f8jLiq522vSBMehWhFb4SsxDZ/GdrlWARFRl83OL8sRquZQ6tVka6DqHfqXJRKWV6a6AEweAbVtwBK6WQsS6ltvB3R/XppxTx6G1QDayQsDc5zqeefJVoHxdpp9HtMpZKQM/5q/y7stALmPmNtGA83rcpInS5IEQb0M= 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=D/T+YVQs; arc=fail smtp.client-ip=52.101.126.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="D/T+YVQs" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w+yBKElpUpHT8+gRjqJVT2BHRB7E1mcnDupTDaymDZmyevq1NxVfkkvpRGuhy7Hr18I2KdCoQAWhpI7dIBYj4ma1mqyoaGT23I3FrARA5SLgcwn8euiL/OBAQQwGw/YLURSVYPDXlvezNASjBu7Za86UqOGxYwwCcA1zuGMG4fy41aVzHkETn0QHT3ducjFPiwS76OLwD09kcfIn1sDjHN00cI4dZm6Jbo4hx8wzn7QiNil770TZj5sG1ij54TTjpt01CXk1eopEoDS3FUIHwarJvYLvAedcpVEGxOIZDfhwr2okpPBtRf2CnY0484yQ9EXB80TNDYXl31OHlyOR0Q== 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=Oe8VGlu/z2A6ZQb+J/mOPu9V83/0DQz/hiQuxGh6hCI=; b=U5+qw1Wl+evqnq0wJoTMkOWTtJbqy8Uwopbkvho3ZmGaX/6I0Nva0EcIqJia4u7g3V6oDiVGovr1lqHamgO2Q5Oqgh1sq9yCvdtv+kw5rHh3cWYMeyR84Bx9Tmh7PLkS89YhMidCmuQx4Yj8SePmwJLd/t9qTwzdPkgslGzlm4f7DRIXHrntAptmJML4wTFW2E9o63KCq+rGhF0EinQrhwVVz9y1LSdJ2WkXFQy/ieQL/KR/0x8pK7RbmKPuVRLH7FJNIc5keh7phLwOYw4OLzuaatCdphw4SeE1sFSDT/fvBzeISD3TNjJXKXO07s6+8V6LfphtiI+BPVIWAMqvHA== 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=Oe8VGlu/z2A6ZQb+J/mOPu9V83/0DQz/hiQuxGh6hCI=; b=D/T+YVQsOJkeg0HP5/wjXoxX4UTiN3R2hJAhYZvdw2dMB3hsLzNxjJJIPwQJo/PDM0b6EbvPO7mW7W/LrOIYORBjtlchPg/pXSA9XLdhldKdF4hgnr5j5HOeLcicL9Ps63KLhs1qRoB9ESiaj+Hyk8YAShwvuKf/udtm8QlKpG3gG+DozpHd00bcjuDBGxvZfm7ctpEADAE57XsgySsr3KyvSIUqQ2wr3/EIxs1TOdYNpqfgbPgFQfE4N9nqNO9Vhxlu3zVEVaxYXByuWbsxuLzkGfu88gEBAKnfjtApNPVHfCmuGfS5kYXvC/Uwy7hddgQFINEuYtefAyzvGSJOlw== 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 TYZPR06MB6896.apcprd06.prod.outlook.com (2603:1096:405:22::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.18; Fri, 15 Aug 2025 12:16: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%5]) with mapi id 15.20.9031.014; Fri, 15 Aug 2025 12:16:36 +0000 From: Qianfeng Rong To: Sathya Prakash Veerichetty , Kashyap Desai , Sumit Saxena , Sreekanth Reddy , "James E.J. Bottomley" , "Martin K. Petersen" , mpi3mr-linuxdrv.pdl@broadcom.com (open list:BROADCOM MPI3 STORAGE CONTROLLER DRIVER), linux-scsi@vger.kernel.org (open list:BROADCOM MPI3 STORAGE CONTROLLER DRIVER), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 5/6] scsi: mpi3mr: use min() to improve code Date: Fri, 15 Aug 2025 20:16:07 +0800 Message-Id: <20250815121609.384914-6-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250815121609.384914-1-rongqianfeng@vivo.com> References: <20250815121609.384914-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0196.jpnprd01.prod.outlook.com (2603:1096:404:29::16) 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_|TYZPR06MB6896:EE_ X-MS-Office365-Filtering-Correlation-Id: 7411ceb5-74e7-4b0c-8386-08dddbf594a6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|366016|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?A0l0TMIWinTEcvrUBmG6I79sfMEf7Yj0NZ6zvaoio9CZluZAKOw1xNl3V9Of?= =?us-ascii?Q?YKuVTNwfLghpcHWSWsv/LsGHGOb6G+V26JHueLTjddjvsyV2U2/gVDQQZu6l?= =?us-ascii?Q?+ScTYEvsvuy+7lV1uCeM/WnR5Ed+P2et+WoSedmUZYFsIiPO+0B5Na2YkbUD?= =?us-ascii?Q?wFQ9EjsT1gI5veJQ2r+zP6BUjI+2zfE6yT98fqBELGEJgTWxoL47tWpFG5Yq?= =?us-ascii?Q?TmMjsiYIWLFBQp+Ms3KaGSlbAZvwau5a96pABnX/iJgvvTSvCMa1E+spWqxz?= =?us-ascii?Q?79Kh6YI50+S96aoH+Vb1PjCF4PGx5+/klkyDCEXahnmv13jReGq1v+QbDXli?= =?us-ascii?Q?V/HNWRLwZPZPx/dLUmfF3WhbHpYd3xgHtI2kkQyAOhN6oqBOcPQuk8P6BMs/?= =?us-ascii?Q?4gIq/FbjgLc+7Gx9WXGLxRuPgP+7EWavpIi464K5lah0tK+KfaBQ+zWZk130?= =?us-ascii?Q?qTuLwr4dfq9n2OpZFRPngt2C1zcEsnq/yZFkhlwz2TOHoRZ9WeDhXRs84iL2?= =?us-ascii?Q?y3Z73o7fbTVKQYBpgMfecrTi80jtK4E9DJMPLp4Poo4WczKuoKXMbQtBVxju?= =?us-ascii?Q?2BPA5Ui+hcHGEYCqveP8E3h5ddzB0H5S4D8NCkkBw+/HZufSCwQDhfSOkq8d?= =?us-ascii?Q?rbrdGHkzeF/R6SACYdbsxaa4T1qN4/CITADDwX0GOy3WagXzXiSt2ZPPOBbL?= =?us-ascii?Q?GfK5tLosEZ8tAWZ2IhY1u2BfmgCKt+38/rysg8tfTJV+mKqi/xW5hfvPF+cI?= =?us-ascii?Q?rAFsRrWu5wURyv7eUg1y+VGX/HSxWPGGQKkNp3NHBwWrQEhJ2hNjyaeVB2Wc?= =?us-ascii?Q?AmcOTMohGse5PdY+sKP4YkUx4EOdl96Y8asXEh1e8hhT9wIr4GICBBHfHkce?= =?us-ascii?Q?lSGNSh/ueNUqHCwtVo7WZVlGT1YRfdAU63BBZGLHxLJT4tPiHzylZm4uLJsP?= =?us-ascii?Q?8VruG3m05zhA2C2TFOVU8bPlFzFE8wtNIgWnxCo2PmldbMVo+UGJHYjVISNi?= =?us-ascii?Q?gBtOoTPsrs/CxgL6U4Zd/kFdgfY5HbQ2a16okqitus090zYRZE2BnQII98L4?= =?us-ascii?Q?MNelwY0/aTwe7Ra9e1/vQvW04A/kQSm12+ee/Rdu5wT9JqTDcxJ2UvHbK2SL?= =?us-ascii?Q?vOhdFWyD0IUNQXcSiV2eePYHQQKoHn5KvhrqUorjdLnnpTIurhma4Mfw5F7c?= =?us-ascii?Q?8ZJokMjNs2X1i+txySmUsCcN4n0FGhg+PyjuOw+CMAZg4YBhCrLPolAYh+/L?= =?us-ascii?Q?jYblei6Y+JB2Sm4NEHhVqxTHipxyET1lldtzBXN016jsFyKrE6mLQhq3yIDg?= =?us-ascii?Q?d+jNkGSIu9+XJhsUuopqFZaX6ov2H8+I+r5UTF2iqsm1s6fwLZqSOUnBTYwI?= =?us-ascii?Q?708MZI+3Xcv4sL6jG1PjBATG8su63FgJuQbdzA4y3YwyKIerTNZwzzknLs0K?= =?us-ascii?Q?oM8eykl7W9L6GiT9CroyZXvkkkURL8IDFhN5dGlFZv8JSAjH96Edug=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)(366016)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ads5bvGCESCOAnU4tlZOxJcCaAxOFRZZ+otatWdqgYwsIWkrR4gxAH4ryaAP?= =?us-ascii?Q?oHcxQWkZYQcoR+vrxOxmlWhjWCxSzQ6JbZVTMF6rZdZJD/Ab1+SckztCPk/F?= =?us-ascii?Q?tSj7G/lRrU7cvE9Iut4hwIRgHpVW+lp72KzrQ1eTUKqzXAjo1ogxJwfafkEc?= =?us-ascii?Q?fPefH5LZTO+jRLd1B6HeRssptx1Ijkr3A0Ij1nur5I5Jow98n7OCHTzO465A?= =?us-ascii?Q?p+rsxFLofW0VZkVl7fSr16MGOVqmFlZ1am1ONrMlIIWk2oLdarkKWDUd7BXz?= =?us-ascii?Q?ftwa3lh+sIA0uX+pEPDLUXN29eYw87ASegsh7yHbL4Jl4f6m9O1ylM5Sb0XY?= =?us-ascii?Q?XqOmVRuB2gkqfbfRC2LJJVrZoIcC6fKLtbs9Q8AYMHE8e8Dp9/0Mgg7a+qz3?= =?us-ascii?Q?4R+caMwP5g9myY8xuwpMK8PN7tCGkQx9vilExUziEGMiJXYxg+P77EkmNjef?= =?us-ascii?Q?0qraf3woHT9lfUWkz3YFyypugQN8sCPTqPY0lmR0zGty7Ih72Fx/a3wYvmHy?= =?us-ascii?Q?gtTf3a90JOX1gweCinodgBhzoHNGeiVs88E4IuKy+0wp2hS3LpI1KD24ZqFp?= =?us-ascii?Q?Z80nAXkZOvWEYmzpULCmfd3VO5UQm+YgeqRIfT1dL2HRH6sfwY8OpUKwGjX5?= =?us-ascii?Q?vrfYqwq/r2y2In9+JtPmpf+JnChsHCWMCaDpljV0pSdfbjPWjbTm0VYCvMSD?= =?us-ascii?Q?enrNsFQSn0YeG8Tokc6W1G/957nIs6Dl7SGvCVyVgsjr5Ivp0w311FgCUWVr?= =?us-ascii?Q?iLmgVUgTKK3gN1GuJNWJ0+yw6uUAC6cv4ILRDHfB05QRReJL54tZl3KqUUzE?= =?us-ascii?Q?qsynvSwZNdCI+gE1iPkD+cc8naHYnEpIM9lEXAuMmZpIzmOyMlqbqliCtl6d?= =?us-ascii?Q?/ZpegiSlQzr0WZacLqh4LCoFq/RRNL6Vgx9U5LbyD3rJSWHh6T7y/ghwgQUl?= =?us-ascii?Q?Gx7sCVZhPQdeaD/nf4ju2eh/+DoR8Hqby6lw3vEW2ka1lYmOaSOIvAHQ2YJJ?= =?us-ascii?Q?JHTRlspiqIzzYFwdKUHlqEaIiQ6eARV00VQqr7PesOhF5FyXTlZ3X9Zoqasv?= =?us-ascii?Q?A3pWnJY7t5DnOL900XtthfUtAG5i9C6wkt0ryeVy/Yk9XbEiq9yLBaTbRQ9r?= =?us-ascii?Q?ixf0o4i0xHCm5KjsZI1BMJlGFPnSOZzrh2ctDL9rj6IuyOEEepO/aZOZCATM?= =?us-ascii?Q?tNXmlAa7L2RE8iHChkypZpX+pCs80S8PI6m+al3T29B1FDOGshufV+0pNa5D?= =?us-ascii?Q?hl4oHX7+sjuRELvOC51ie6p4E6LcSJe7kN3KCR4KcMT918kI5JJsx+BjMJ/B?= =?us-ascii?Q?ELZg48SsDEQLPQz2V+x1HjDr/r7ZdWq+ohWDEckkfZVrlUNuf6n0ir0Poub3?= =?us-ascii?Q?Mwxs6uQof2fZLPTSzUxXVE48vb0kOgZiysk6Y5u4UCYUffwcbtS6+5IZIym1?= =?us-ascii?Q?nkumW9pexrBmnMzgbCtax4PTSTWX07HUfwaeyjwMABgVieQgri2BJR2xxqzc?= =?us-ascii?Q?lvhAYdb2E6lEUMla5QF/YtAsrLpi6zZCMTY7P5Ebq1alwp7iqzZe3rA2s55D?= =?us-ascii?Q?5byFUkjHH8S3RywzC4AN25nmrMHQCVVe6ZmT57tC?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7411ceb5-74e7-4b0c-8386-08dddbf594a6 X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2025 12:16:36.6056 (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: OMgvKKRGg3tdP/36qyqW++nwtfVXpSBh/4zIVElzB3BlAzeaVmmBM966TNWNCF5Csc/7ZVfyxcAFTjCwmZMnfw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6896 Content-Type: text/plain; charset="utf-8" Use min() to reduce the code in mpi3mr_map_data_buffer_dma() and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/scsi/mpi3mr/mpi3mr_app.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr_app.c b/drivers/scsi/mpi3mr/mpi3mr_= app.c index 0e5478d62580..c48dac57b530 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_app.c +++ b/drivers/scsi/mpi3mr/mpi3mr_app.c @@ -2343,11 +2343,8 @@ static int mpi3mr_map_data_buffer_dma(struct mpi3mr_= ioc *mrioc, drv_buf->dma_desc[i].addr =3D mrioc->ioctl_sge[desc_count].addr; drv_buf->dma_desc[i].dma_addr =3D mrioc->ioctl_sge[desc_count].dma_addr; - if (buf_len < mrioc->ioctl_sge[desc_count].size) - drv_buf->dma_desc[i].size =3D buf_len; - else - drv_buf->dma_desc[i].size =3D - mrioc->ioctl_sge[desc_count].size; + drv_buf->dma_desc[i].size =3D min(buf_len, + mrioc->ioctl_sge[desc_count].size); buf_len -=3D drv_buf->dma_desc[i].size; memset(drv_buf->dma_desc[i].addr, 0, mrioc->ioctl_sge[desc_count].size); --=20 2.34.1 From nobody Sat Oct 4 14:16:58 2025 Received: from SEYPR02CU001.outbound.protection.outlook.com (mail-koreacentralazon11013047.outbound.protection.outlook.com [40.107.44.47]) (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 E1FE9303C82; Fri, 15 Aug 2025 12:16:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.44.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260203; cv=fail; b=n3ZSX/wHTSG9lbMHtlr8nGPX/oezruDKVcbfR4woj4Tmndvjlz76o0l1e4tleWlEGDl58FNAUK2sWcGPzyIlEF9fxp2Dfqn3lnWc4V3t3xt1Q1LD923sVqbhAMXcpCNfyczHcGlzSROZZUwcYo52ib/lc7B7Im1YUN+dX/gXVc0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755260203; c=relaxed/simple; bh=xX7Rc8gr5iJiLt8mWA+H8cyioxWg/deX486ngbF3j3U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=iYvi3IMYakm6iZ88YUt5d51kDVJ9GbgG3hEdQ77vuO+ZLqHsUwUzpPLqAHtcrV6usDg+63OxH2g0UvcdvvQOThfBIrjJKGVq/a0HjHFiHPGqoheiqDWAmuwuHjnyUY2EWEAeVAvrPkjTlawjRQq6ghSanI0+54IiESTEDH3VXUs= 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=UkzdLYv6; arc=fail smtp.client-ip=40.107.44.47 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="UkzdLYv6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PCVoMoxW8y04SksMFMN2u7VyaUj0XEzT+5git665PaZKxEI43UZDwpDs4v7C1ogYRX9rgwr5Ru0t18Ew5eHIYzaofgG1yVKXlcQaTHCii/Vn6S6h7jUgpRlW01qknYQHLT426BPbp8rJhiRQL590ag2DPkzcuQe4++8Wi1qv/EsPWXCBsk661mESs0/Y1XYQoD6TsmgiYdlRP7YDzcmcXrRIXKxxgZKTtTrjichhhktkIOa25v3anQdh9x37CVmbnO43i0+CDE3vFWjTO+5NCsirVqO4d/W/Bi55CYidy0EeynKyzGhyb2gVivUsdmRLu+he32DALK6TfqHBQrUk8A== 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=hbVvJY/r0UpmxKloU+ya0UHzxCjJRn5+ldmbh+2r8yg=; b=CfcN8EWy8aYTeq3OdoW+SxMtv+UesQgEMq8DyCCRxwhvJFccUqDgtt9TG6b9Y143DPxfccEXSPRIwypzwHDfpKhZRt1JCK0PSUogyzq45CpyLB7G2vZLcgt/zfg02M2wjC8N+ITDHAp0qu5fbZHvqIU46hGimsy8SP2T/+e/o/oC+6OtYrGhh/D4aUnv7JjdaMVlkjbLZeTub1Gtot2oKN2wmJnyzTxCtWL52I2EphgVF3M+4LWdNXWi+Eqdht+6SLI1hPTpig1DJZMuBaEWp71kfqXqfrAH7brtZvlMpzFs+MFjSCbCxxjuODZo2QDdqLDcmY/IhmPIk4nEnnGbwQ== 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=hbVvJY/r0UpmxKloU+ya0UHzxCjJRn5+ldmbh+2r8yg=; b=UkzdLYv63iLPRw9GrB6OouKzs9Wa+lkY1N6jcE4Rr209z8GNvwnghZYiXifWaEaMFHtwR0e+0B3N8Cd+AvW6xBoyOkxjYT4AJFAsxyOiB6SzndBM8718/0FkfseSmaHBqK86CuMaICa004OvWyAUTy6MD4udXlTGtobb2Eks+Lok1zEOAZt4TaBVrxNXggErbrpC0rGtKUX796fTZSHiBnGwBo2dFLDRLEuwVtFBjX4KP2113W9HuyOv14d3W+3b0uW24g9rdvdHlnPkZBsEaByjR4ZyoxlmUXcr/dmABaIN4POS+V2tUgpBHPzeUhRdK/GbnZ5NEUD0A2dWctfOhQ== 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 TYZPR06MB6896.apcprd06.prod.outlook.com (2603:1096:405:22::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.18; Fri, 15 Aug 2025 12:16:39 +0000 Received: from SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666]) by SI2PR06MB5140.apcprd06.prod.outlook.com ([fe80::468a:88be:bec:666%5]) with mapi id 15.20.9031.014; Fri, 15 Aug 2025 12:16:39 +0000 From: Qianfeng Rong To: Nilesh Javali , GR-QLogic-Storage-Upstream@marvell.com (maintainer:QLOGIC QLA2XXX FC-SCSI DRIVER), "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org (open list:QLOGIC QLA2XXX FC-SCSI DRIVER), linux-kernel@vger.kernel.org (open list) Cc: Qianfeng Rong Subject: [PATCH 6/6] scsi: qla2xxx: use min() to improve code Date: Fri, 15 Aug 2025 20:16:08 +0800 Message-Id: <20250815121609.384914-7-rongqianfeng@vivo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250815121609.384914-1-rongqianfeng@vivo.com> References: <20250815121609.384914-1-rongqianfeng@vivo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0196.jpnprd01.prod.outlook.com (2603:1096:404:29::16) 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_|TYZPR06MB6896:EE_ X-MS-Office365-Filtering-Correlation-Id: 01664715-a6b3-488e-cde8-08dddbf5961d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|366016|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ernj2l3S9oJRKMT273tKuby1SxXrF4slLEraYYoHuRYwdx3OSCcqFZuuIBJa?= =?us-ascii?Q?cvloAt5ObhGXfMZwH5fMCStjSJ1wBDN7FembXLyNz+bt1+zhQCKNaP6SjE3+?= =?us-ascii?Q?CmMsXXzhGYcJQRuBOhPcks7yJcB6ea99bdJ35IkQ7f5Ez9gMj/41XOEgdk2u?= =?us-ascii?Q?P2/aVYJPUw4ZrGJ3GZB9N5IWAVGS/8juTMNJJojtxtq84Hu/RmmIyMWda03G?= =?us-ascii?Q?23K1RF29QcdJ4U+NSFjK0llaBGYuKvOwMQlDnJ2LB2uBLJ4q1q4ZfhGjPJ99?= =?us-ascii?Q?eyBsCZoKbqUqecfwSt5RAZ4luMKyiQjiwHmmTbtfaXcIN60steXVhix2vSvl?= =?us-ascii?Q?rQDcMiuLEz7Bz+FmdUTXvhQa+MH75PmcjpaGXCQapemklbVS6E4NEmg1sU73?= =?us-ascii?Q?21cF7tS4rqe+pAqpZXc5CZt7W1AwCW9Rpzxyb6hhcA1uZ3eTh2IcOWx7JU0/?= =?us-ascii?Q?0WmIQZw+2lJYE0W0TL0lOqTtAju5eOC8p5bT6Ae4+qrZOCyl+51yE4Zyc1Ui?= =?us-ascii?Q?ftZG+hZhHNmRI/v+rxF0C1cRabQwrwfU5j16bxO/0LUMOCoUlpP65R5/f7S8?= =?us-ascii?Q?E9wiqTMJRw+6IH1uf2l7x6eJKAa0fPrgBM9eyF7wgC5KwtQqwJ6DDg4ep2Pm?= =?us-ascii?Q?sx77Jg/HCiIttXGyWvp+9pRIjBEpMm6KyZM88zSuu72ySItcr/n3+FHrhvbC?= =?us-ascii?Q?s3gOksGas2nrSwyoJYQ93u0HA13BTqk7dyedvdVVHdM2X0rSLo0WdoRhQ01p?= =?us-ascii?Q?00y2mJVS2eC93QDJ7ChDoRc0swTSR1NvRqnfymrZBdqrN01+LVjQc03MNVja?= =?us-ascii?Q?XtRtAID4j4ER7gyPvjMk0+A/ii7C86G5BHLsLrLxawn27N/kZ/53SP+FKuUS?= =?us-ascii?Q?rjwdwrlucTX8X2uRtctuGBChsCeORVHJRT52CRu/ciwF/nJowr0jW7vyxeRS?= =?us-ascii?Q?rt07CSO13N+fX2kVb0u5beeMR3dfHjNC2nuroPXXvgXqrxN5nGt+5rouzFIp?= =?us-ascii?Q?iwp2mtDGm1dUnQ3OV69iFufv7BixG/TSGMLEc7PkoCPe0bVBe/En1Bu2fSKX?= =?us-ascii?Q?Fww4eYVcfhsoGyP9bvRfKEB/C6m+XZeMVuxBaKOP+TinC7jmNu2T78aigI3f?= =?us-ascii?Q?tXsbNL0PcmQaLe0gPtWZWx1A2eMyJZGSbQTkgM9QUDRWv6grufbcAd45ZDZZ?= =?us-ascii?Q?PJJttPkbrI3WYIkNXMQc2JFpIu7TNahefQo6w1aBeHgim+0VTVsNhbKUZnUP?= =?us-ascii?Q?vCTfwtCCNHcpYWlbCK194f1ZuMOIBo7zPLP73z3tq+TY4lWlh7m1gPj8VuoB?= =?us-ascii?Q?p86uV+3pgoCdsqp9pQ7Gs4/73foa8HCEwH6v2l2D/b4fUJMFC95WDSGeooDf?= =?us-ascii?Q?3MJXDKV7lRj/QYEDGlWSnFBA8QHpN/iS1ND136T2xNEIXyLRvjJlD1Rt/R1Y?= =?us-ascii?Q?bD2gBk6j9E92o5dR+9No5iQP0hDPYJpoQ0HH7GiCHauiGLLtObVSNA=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)(366016)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SpfR7KlF/Up5/hUwc8lp0Ova8rATdRhyPRIQbQQcvqAhny3l90/azeoYS06B?= =?us-ascii?Q?tCrSMKUkC86zPVekpHy33whD4XnvGKnsGR4O8Tby77W6bd3DwViCT4guuTNr?= =?us-ascii?Q?78ulQFR6v6md0SBpHyngS+eBiQ0wovJZtlW9kJHdiHTQUGTcFAAtolaAmxNl?= =?us-ascii?Q?hYPsAeHAZAblkvQv0AN+RuUhqRrWNiSoQfHF//DRNkB9OPFkJaks1Dd7xEVg?= =?us-ascii?Q?eQTl8gTYF1+W9d6dW+cWF/BiOfzTAQcONMYSYiYlW3bORq8bZaoiFraGwPZM?= =?us-ascii?Q?CrPWosQdLynpm0Tr9EW/mvSZhhn6jsucspWUIkOgynP3tZuFJOokhpKPJXpS?= =?us-ascii?Q?ij2deLLPhUzy0g+hMgBlag3jSbCafVMGNHUY7Yt4JHgZo87nTxpsAsG/3ylr?= =?us-ascii?Q?j+PtUwMusr2/WwtqAyjB+N/f9aM+72aTC4lDhJwQvjo+0ezhjP3JxSDijEKH?= =?us-ascii?Q?p2J0UbAmjkLdMpS1ihA+QaRjscgB67dmQGiuk+SbBnBLx/0+DegSDFUPcH9v?= =?us-ascii?Q?YXdxN59B+ru5V0c7usT3ZUn6ceLzhOt9ZIN1KlJVikLHnuJTcEqbV5TGiMRq?= =?us-ascii?Q?8Wa+gDI1ctzpSf7Dxzem+A7IsvsNjS5ME2lC4j4L8LbQrD18/0YmMQcozBza?= =?us-ascii?Q?m2VtPUyniNEz75et8Y5AqFZIXYdI2ScCEtj9534khiONb+5HdnOepdRQe2vv?= =?us-ascii?Q?e7bw2N8YpepKlH8ziGu4vWrjgbjT0w3ovpEmsRkjBeDGhyOv9gtERo3vvStl?= =?us-ascii?Q?YCJ2nbIRLCiX+AlLLRU541hjxkfDCNzeCfSlV7nmRGT/8EvDvy6ctKvuaztP?= =?us-ascii?Q?yj6gOwfLPsfmciJbBrUMKVvEfFKa5sAeGYA0mznvlC/Q6EC61EmUwV3vONmr?= =?us-ascii?Q?8x25ZH1zAyIJR/9CQY6gJE3XOcOtY+NXcxhJReoL/DnpbYmoBcJzSQkVGXIs?= =?us-ascii?Q?BNE8i9Lei/gLcdlkaZFuCzj/3szuo7Hp/mZJDa4CPqjG4tbQrkWmsO9Eor3Y?= =?us-ascii?Q?lTcfcdCBOggxWtr6WAkWLmPBmNy0R/z/SHIvl3q3N4aoMzcmduL710pZ/Sqa?= =?us-ascii?Q?bgSzJ0oM+xivlfYFQy+VbLkQF72MN8onTHEdEwML9cIAAEMMgqHjJhB08nmR?= =?us-ascii?Q?5YMZnj3z0dn3LS4FRxCiBBE17TYyQ/4LqW/m70+Vi5/70XWb2aB9zOPJEKUe?= =?us-ascii?Q?ioAUnjNMID8WHOfApPdln4H2gfZvUvijV9pVfDJQyCE/ZMXq1FVBifT7lMbU?= =?us-ascii?Q?d1QbaZSIa7HLss9CMfDqZ5z7na5+RbZkjv4/t8wwM34gnOC0LguYx1cevJGB?= =?us-ascii?Q?u3816mdhCGIdSJIP2Lc3R+3Aix+oqkZsaIUrC80QXQ6rKf87KV5D5HxqG1Az?= =?us-ascii?Q?ul3eSaZL6t3sFbNdOle4v10dyskvYtXs7wPr5JPUUaO3Xs2nd73IYMerTGCD?= =?us-ascii?Q?AHfJXz4OtzzoEyS1JDkuOzPkahMh73ooMI5qCfv5HbU+C2q2+OciEiDHwtfD?= =?us-ascii?Q?Y53h3yDwfVGEcMbYwQgMtvqmYRk9x+H3LaWXntC5ZxG3wXwLrHX0/y6cCYC8?= =?us-ascii?Q?hykd1RD10riTbmvwE9fVYKKGVN00ndJl1J0RWlS1?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01664715-a6b3-488e-cde8-08dddbf5961d X-MS-Exchange-CrossTenant-AuthSource: SI2PR06MB5140.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2025 12:16:39.0371 (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: UVuV2CJuFcAMikX6w8zNJI/Zr5+TI2pjGfc4STqGuOZsTdLjM42OuXibu89mZKQeSn7FIZ38QlusIjN00icwrg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6896 Content-Type: text/plain; charset="utf-8" Use min_t() to reduce the code in qla2x00_alloc_outstanding_cmds() and improve its readability. Signed-off-by: Qianfeng Rong --- drivers/scsi/qla2xxx/qla_init.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_ini= t.c index be211ff22acb..52fc5b8932e3 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -4020,12 +4020,9 @@ qla2x00_alloc_outstanding_cmds(struct qla_hw_data *h= a, struct req_que *req) =20 if (!IS_FWI2_CAPABLE(ha)) req->num_outstanding_cmds =3D DEFAULT_OUTSTANDING_COMMANDS; - else { - if (ha->cur_fw_xcb_count <=3D ha->cur_fw_iocb_count) - req->num_outstanding_cmds =3D ha->cur_fw_xcb_count; - else - req->num_outstanding_cmds =3D ha->cur_fw_iocb_count; - } + else + req->num_outstanding_cmds =3D min(ha->cur_fw_xcb_count, + ha->cur_fw_iocb_count); =20 req->outstanding_cmds =3D kcalloc(req->num_outstanding_cmds, sizeof(srb_t *), --=20 2.34.1