Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Guo Zhengkui <guozhengkui@vivo.com>
To:     Nilesh Javali <njavali@marvell.com>,
        GR-QLogic-Storage-Upstream@marvell.com (supporter:QLOGIC QLA2XXX
        FC-SCSI DRIVER), "James E.J. Bottomley" <jejb@linux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        linux-scsi@vger.kernel.org (open list:QLOGIC QLA2XXX FC-SCSI DRIVER),
        linux-kernel@vger.kernel.org (open list)
Cc:     zhengkui_guo@outlook.com, Guo Zhengkui <guozhengkui@vivo.com>
Subject: [PATCH] scsi: qla2xxx: fix minmax.cocci warnings
Date:   Fri, 13 May 2022 16:02:10 +0800
Message-Id: <20220513080210.53143-1-guozhengkui@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bEsKHtY4cFtMVrif0x/f4hdtyJwlSExM+cRan81bBVOru5KDGOS+m8qQWbtz?=
 =?us-ascii?Q?1v1HnJjgFONe2mk/CoEuHENmN/cm7jJa7K0Of9upuUynefksOheVWmHzLJqH?=
 =?us-ascii?Q?V9BmKrQCAR4K6UisYfu8mciFwhcv13jDi5qD0xX1T5RxUY8UQ4i/qfgNmViQ?=
 =?us-ascii?Q?rNaNFuMgJLIzgTtEuNZCoX5GpCZfiC6IHwhoq3XRoF7Gsnc5WpTCVbAZdjfr?=
 =?us-ascii?Q?OZYJ1qed6innpMLs2v7gzKxHwBiUO88t3ea5CfAytsaygY+bOyDXO7Dh3pLA?=
 =?us-ascii?Q?q7SToX2/NcTm7GrKIB1KAidjfOgUjuN/hNLA57o7CpwQHHXrw5O+z7dq+5UK?=
 =?us-ascii?Q?iMHYTg/S79Og+txfmOtOBGFHD1T2FaIwiYIhnwD4i7qUwGniLOl+yXcHEgFR?=
 =?us-ascii?Q?nx6FMejRq5Rn3eD1fQUKcWHpoDNiBHnznkMMwCvGF1+r9ncl7DyNh71bo5fp?=
 =?us-ascii?Q?oMhGF20RCaf5jOMN4LyGZ+VVow+gNvISBPrr4jXEE1eRC97c6tOagwLvFhCr?=
 =?us-ascii?Q?NmUyc18JatDsJ7x+LFhBuXzQtFNKcs5N9fHSATiV8WsGUuMLM6f6GmD6qSYi?=
 =?us-ascii?Q?TnyFwIoWuROwAMPBQWzmwLCJPfoLVbDf9m6IoBlbWiHlPnh7HVoWCBXgrs7O?=
 =?us-ascii?Q?sBXGkR6POOpWiBTb5dRZik8EJODSXlUCH5ktB9gQNm+vxFy5vY2fYqcDFGz6?=
 =?us-ascii?Q?LkD9yVd4uO+02zMhLAwZ7ngf8dZ7LSOccaWXR7G3aqPkGXpycpIydXlimgOM?=
 =?us-ascii?Q?3oMfiRFWdDsDcuseQUvRRLYh+7+f8GqsE0h6SHk9T0pk5zQFPlLAYfIzeegP?=
 =?us-ascii?Q?LPSpTlkaZh7sdyIwmG/axLZHDCxCLPIGSRCUQdo+fqkr0HBUkkagITqIUM/Z?=
 =?us-ascii?Q?zgF+tgIVHk90OYApWMBCJmv+1zXBz5x6VgO06yyMPvaGbOPpbos/Z+hTFrGp?=
 =?us-ascii?Q?InNGOZWL9kXtrsI0wDGqCjG+GJYshEhnKGQEvynzs8tRX0+JZjZ51gs3Oy4K?=
 =?us-ascii?Q?eWV4OJYh8n/lS635PUC3uQRpN0PI8oxZ63GBdc9r91cIeq0xAn67QQuyzCXK?=
 =?us-ascii?Q?MtI2qHacOD+K4jAMiyTUCQSJawu2MJOCNM5c+g64H0AdElAjhtFDl5MY5Wux?=
 =?us-ascii?Q?ujMQLoKKgONy2z2dzOfCrrVpcLGM8Q1TR2EXUjIalECieVYToFdUIMDvKSQW?=
 =?us-ascii?Q?4/aOpK9btDIdsfwDszcZoKq3X9rGjJAiWyN4oN4jI2gj2Qbqo2WmY5KoJPEn?=
 =?us-ascii?Q?/vrwi4KscZeUM0tIlUQS5A6qJHArQTrHQxpd7F5xTfY6BnfsVPjLJCaKz+u6?=
 =?us-ascii?Q?XpJTGvJolhMimMHzk+Q0EOoiQ9k8AlFfblqe4+68Lf22aRZ17nki9ijWeemJ?=
 =?us-ascii?Q?9uuVjsTqpxk5f0RzvLPFOaThRqAJMNIYMQDoNTobWgOjlOUPu/6Df5NVEdx4?=
 =?us-ascii?Q?2LMSV/h9NEkwmQ3z+hljZ/q0ZZVqTaEHJTQ+K6zsacsE2ARUaac75wAclxif?=
 =?us-ascii?Q?waNIydGsHXPh4T6TAJ6im5UARFkubhcLJozQt4VMnCIvZqExIraGr+TFlmf6?=
 =?us-ascii?Q?bDiTFdDWw1qABcLHdsj394oo0WzfGE4Fu4qR7nlAko12+11tGrNi9ehNAjC/?=
 =?us-ascii?Q?jmpuG6jJUTAbdQsGhvzC/Fzukp9aIgX8tFxBOe3OCZkM8iN7uLJUys5TI5aQ?=
 =?us-ascii?Q?810XHjAenSnUOBdoL9e7TlRu28CinrYs74zT7EeZZ5zl9CaXr5S+T1MxlLCG?=
 =?us-ascii?Q?cfBLP7skFQ=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c2406fa-5f9c-49a2-1996-08da34b6fe0c
X-MS-Exchange-CrossTenant-AuthSource: HK2PR06MB3492.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 08:02:57.9900
 (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: w4XNDYQZhKZS2FiT4hjlNF3kjVUBniglZAnPBe7BcPofoQgYowXaQJkYNdANMzF/dvQDC5O74LwR8uJpSyJSGg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5159
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE,
	SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Fix the following coccicheck warnings:

drivers/scsi/qla2xxx/qla_dbg.c:689:30-31: WARNING opportunity for max()
drivers/scsi/qla2xxx/qla_sup.c:3628:28-29: WARNING opportunity for min()

min() and max() macros are defined in include/linux/minmax.h.

Signed-off-by: Guo Zhengkui <guozhengkui@vivo.com>
---
 drivers/scsi/qla2xxx/qla_dbg.c | 3 +--
 drivers/scsi/qla2xxx/qla_sup.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 7cf1f78cbaee..9dfe1782634b 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -686,8 +686,7 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, __be32 **last_chain)
 	mq->type = htonl(DUMP_CHAIN_MQ);
 	mq->chain_size = htonl(sizeof(struct qla2xxx_mq_chain));
 
-	que_cnt = ha->max_req_queues > ha->max_rsp_queues ?
-		ha->max_req_queues : ha->max_rsp_queues;
+	que_cnt = max(ha->max_req_queues, ha->max_rsp_queues);
 	mq->count = htonl(que_cnt);
 	for (cnt = 0; cnt < que_cnt; cnt++) {
 		reg = ISP_QUE_REG(ha, cnt);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index c092a6b1ced4..2703408c60e7 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -3625,7 +3625,7 @@ qla24xx_read_fcp_prio_cfg(scsi_qla_host_t *vha)
 	max_len = FCP_PRIO_CFG_SIZE - FCP_PRIO_CFG_HDR_SIZE;
 
 	ha->isp_ops->read_optrom(vha, &ha->fcp_prio_cfg->entry[0],
-			fcp_prio_addr << 2, (len < max_len ? len : max_len));
+			fcp_prio_addr << 2, min(len, max_len));
 
 	/* revalidate the entire FCP priority config data, including entries */
 	if (!qla24xx_fcp_prio_cfg_valid(vha, ha->fcp_prio_cfg, 1))
-- 
2.20.1