scsi: lpfc: Use secs_to_jiffies() instead of msecs_to_jiffies()

[PATCH] scsi: lpfc: Use secs_to_jiffies() instead of msecs_to_jiffies()

Posted by Thorsten Blum 7 months, 3 weeks ago

Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling
the timeouts to milliseconds.

No functional changes intended.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/scsi/lpfc/lpfc_bsg.c   | 6 ++----
 drivers/scsi/lpfc/lpfc_vport.c | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index c8f8496bbdf8..d61d979f9b77 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -2687,8 +2687,7 @@ static int lpfcdiag_loop_get_xri(struct lpfc_hba *phba, uint16_t rpi,
 	evt->wait_time_stamp = jiffies;
 	time_left = wait_event_interruptible_timeout(
 		evt->wq, !list_empty(&evt->events_to_see),
-		msecs_to_jiffies(1000 *
-			((phba->fc_ratov * 2) + LPFC_DRVR_TIMEOUT)));
+		secs_to_jiffies(phba->fc_ratov * 2 + LPFC_DRVR_TIMEOUT));
 	if (list_empty(&evt->events_to_see))
 		ret_val = (time_left) ? -EINTR : -ETIMEDOUT;
 	else {
@@ -3258,8 +3257,7 @@ lpfc_bsg_diag_loopback_run(struct bsg_job *job)
 	evt->waiting = 1;
 	time_left = wait_event_interruptible_timeout(
 		evt->wq, !list_empty(&evt->events_to_see),
-		msecs_to_jiffies(1000 *
-			((phba->fc_ratov * 2) + LPFC_DRVR_TIMEOUT)));
+		secs_to_jiffies(phba->fc_ratov * 2 + LPFC_DRVR_TIMEOUT));
 	evt->waiting = 0;
 	if (list_empty(&evt->events_to_see)) {
 		rc = (time_left) ? -EINTR : -ETIMEDOUT;
diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c
index cc56a7334319..2797aa75a689 100644
--- a/drivers/scsi/lpfc/lpfc_vport.c
+++ b/drivers/scsi/lpfc/lpfc_vport.c
@@ -505,7 +505,7 @@ lpfc_send_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 		wait_event_timeout(waitq,
 				   !test_bit(NLP_WAIT_FOR_LOGO,
 					     &ndlp->save_flags),
-				   msecs_to_jiffies(phba->fc_ratov * 2000));
+				   secs_to_jiffies(phba->fc_ratov * 2));
 
 		if (!test_bit(NLP_WAIT_FOR_LOGO, &ndlp->save_flags))
 			goto logo_cmpl;
@@ -703,7 +703,7 @@ lpfc_vport_delete(struct fc_vport *fc_vport)
 				wait_event_timeout(waitq,
 				   !test_bit(NLP_WAIT_FOR_DA_ID,
 					     &ndlp->save_flags),
-				   msecs_to_jiffies(phba->fc_ratov * 2000));
+				   secs_to_jiffies(phba->fc_ratov * 2));
 			}
 
 			lpfc_printf_vlog(vport, KERN_INFO, LOG_VPORT | LOG_ELS,
-- 
2.49.0

Re: [PATCH] scsi: lpfc: Use secs_to_jiffies() instead of msecs_to_jiffies()

Posted by Martin K. Petersen 7 months, 2 weeks ago

On Mon, 28 Apr 2025 19:16:26 +0200, Thorsten Blum wrote:

> Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling
> the timeouts to milliseconds.
> 
> No functional changes intended.
> 
> 

Applied to 6.16/scsi-queue, thanks!

[1/1] scsi: lpfc: Use secs_to_jiffies() instead of msecs_to_jiffies()
      https://git.kernel.org/mkp/scsi/c/edf147e215c6

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: lpfc: Use secs_to_jiffies() instead of msecs_to_jiffies()

Posted by Martin K. Petersen 7 months, 3 weeks ago

Thorsten,

> Use secs_to_jiffies() instead of msecs_to_jiffies() and avoid scaling
> the timeouts to milliseconds.

Applied to 6.16/scsi-staging, thanks!

-- 
Martin K. Petersen

Re: [PATCH] scsi: lpfc: Use secs_to_jiffies() instead of msecs_to_jiffies()

Posted by Justin Tee 7 months, 3 weeks ago

Reviewed-by: Justin Tee <justin.tee@broadcom.com>

Regards,
Justin