diff mbox series

scsi: lpfc: Simplify minimum value calculations in lpfc_init and lpfc_nvme

Message ID 20240625165643.1310399-1-prabhakar.pujeri@gmail.com
State New
Headers show
Series scsi: lpfc: Simplify minimum value calculations in lpfc_init and lpfc_nvme | expand

Commit Message

Prabhakar Pujeri June 25, 2024, 4:56 p.m. UTC
This patch simplifies the calculation of minimum values in the lpfc_sli4_driver_resource_setup and lpfc_nvme_prep_io_cmd functions by using the min macro. This change improves code readability and maintainability.


Signed-off-by: Prabhakar Pujeri <prabhakar.pujeri@gmail.com>
---
 drivers/scsi/lpfc/lpfc_init.c | 5 +----
 drivers/scsi/lpfc/lpfc_nvme.c | 8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)

Comments

Justin Tee June 25, 2024, 11:20 p.m. UTC | #1
Hi Prabhakar,

I’m afraid I’m going to have to echo similar comments made in the
initio email thread here as well.

How is this a critical fix in code paths that have been in place for
years with no complaints from users of Emulex HBAs?

I am reluctant to stamp a Reviewed-by on this patch, which alters code
that has already withstood the test of time.

Regards,
Justin Tee
Prabhakar Pujeri June 26, 2024, 1:39 a.m. UTC | #2
> On Wed, Jun 26, 2024 at 4:57 AM Bart Van Assche <bvanassche@acm.org> wrote:
>
> On 6/25/24 9:56 AM, Prabhakar Pujeri wrote:
> > This patch simplifies the calculation of minimum values in the
> > lpfc_sli4_driver_resource_setup and lpfc_nvme_prep_io_cmd functions
> > by using the min macro. This change improves code readability and
> > maintainability.
>
> How has this patch been generated? If it has been generated with a
> Coccinelle script, please include that script in the patch description.
>
> Bart.

 Yes, I am using Coccinelle for these patches. I will include the
Coccinelle scripts in my upcoming patches.
diff mbox series

Patch

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index e1dfa96c2a55..663ce30621aa 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -8301,10 +8301,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 d70da2736c94..d22347318b4d 100644
--- 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) &&
 			    (pnode->nlp_flag & NLP_FIRSTBURST)) {
 				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;
 			}