Skip to content

Commit e79aa10

Browse files
qianfengrongmartinkpetersen
authored andcommitted
scsi: lpfc: use min() to improve code
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 <rongqianfeng@vivo.com> Link: https://lore.kernel.org/r/20250815121609.384914-4-rongqianfeng@vivo.com Reviewed-by: Justin Tee <justin.tee@broadcom.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 0138c16 commit e79aa10

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

drivers/scsi/lpfc/lpfc_init.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8300,10 +8300,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
83008300
phba->cfg_total_seg_cnt, phba->cfg_scsi_seg_cnt,
83018301
phba->cfg_nvme_seg_cnt);
83028302

8303-
if (phba->cfg_sg_dma_buf_size < SLI4_PAGE_SIZE)
8304-
i = phba->cfg_sg_dma_buf_size;
8305-
else
8306-
i = SLI4_PAGE_SIZE;
8303+
i = min(phba->cfg_sg_dma_buf_size, SLI4_PAGE_SIZE);
83078304

83088305
phba->lpfc_sg_dma_buf_pool =
83098306
dma_pool_create("lpfc_sg_dma_buf_pool",

drivers/scsi/lpfc/lpfc_nvme.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,12 +1234,8 @@ lpfc_nvme_prep_io_cmd(struct lpfc_vport *vport,
12341234
if ((phba->cfg_nvme_enable_fb) &&
12351235
test_bit(NLP_FIRSTBURST, &pnode->nlp_flag)) {
12361236
req_len = lpfc_ncmd->nvmeCmd->payload_length;
1237-
if (req_len < pnode->nvme_fb_size)
1238-
wqe->fcp_iwrite.initial_xfer_len =
1239-
req_len;
1240-
else
1241-
wqe->fcp_iwrite.initial_xfer_len =
1242-
pnode->nvme_fb_size;
1237+
wqe->fcp_iwrite.initial_xfer_len = min(req_len,
1238+
pnode->nvme_fb_size);
12431239
} else {
12441240
wqe->fcp_iwrite.initial_xfer_len = 0;
12451241
}

0 commit comments

Comments
 (0)