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>

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 4081d2a358eee8fe22b4b2356d789adedd1b490c..ad8a85c65bfd278dbaeb45aa771115df831c6a4c 100644 (file)
--- 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 *phba)
                        phba->cfg_total_seg_cnt,  phba->cfg_scsi_seg_cnt,
                        phba->cfg_nvme_seg_cnt);
 
-       if (phba->cfg_sg_dma_buf_size < SLI4_PAGE_SIZE)
-               i = phba->cfg_sg_dma_buf_size;
-       else
-               i = SLI4_PAGE_SIZE;
+       i = min(phba->cfg_sg_dma_buf_size, SLI4_PAGE_SIZE);
 
        phba->lpfc_sg_dma_buf_pool =
                        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 a6647dd360d176608345ab95429640689c9abe63..e6f632521cff9506b5002114d00ba70ef5e03d33 100644 (file)
--- 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 = lpfc_ncmd->nvmeCmd->payload_length;
-                               if (req_len < pnode->nvme_fb_size)
-                                       wqe->fcp_iwrite.initial_xfer_len =
-                                               req_len;
-                               else
-                                       wqe->fcp_iwrite.initial_xfer_len =
-                                               pnode->nvme_fb_size;
+                               wqe->fcp_iwrite.initial_xfer_len = min(req_len,
+                                                                      pnode->nvme_fb_size);
                        } else {
                                wqe->fcp_iwrite.initial_xfer_len = 0;
                        }