Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@xxxxxxxxx>
---
drivers/scsi/qla2xxx/qla_init.c | 6 ++----
drivers/scsi/qla2xxx/qla_sup.c | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 8377624d76c9..9caaaf25de64 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -3999,10 +3999,8 @@ qla2x00_alloc_outstanding_cmds(struct qla_hw_data *ha, struct req_que *req)
if (!IS_FWI2_CAPABLE(ha))
req->num_outstanding_cmds = DEFAULT_OUTSTANDING_COMMANDS;
else {
- if (ha->cur_fw_xcb_count <= ha->cur_fw_iocb_count)
- req->num_outstanding_cmds = ha->cur_fw_xcb_count;
- else
- req->num_outstanding_cmds = ha->cur_fw_iocb_count;
+ req->num_outstanding_cmds = min(ha->cur_fw_xcb_count,
+ ha->cur_fw_iocb_count);
}
req->outstanding_cmds = kcalloc(req->num_outstanding_cmds,
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.45.1
