@@ -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);
@@ -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))
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(-)