scsi: lpfc: Use secs_to_jiffies() instead of msecs_to_jiffies()
Subsystems (2)
PATCH 1/1 scsi: lpfc: Use secs_to_jiffies() instead of msecs_to_jiffies()
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 <[email protected]>
--- drivers/scsi/lpfc/lpfc_bsg.c | 6 ++---- drivers/scsi/lpfc/lpfc_vport.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_bsg.c +2 -4
@@ -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 ;
drivers/scsi/lpfc/lpfc_vport.c +2 -2
@@ -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,
Signature · 1 line
2.49.0
Reviewed-by Justin Tee <[email protected]>
Regards,
Justin
Martin K. Petersen
AppliedThorsten,
Quoted 2 lines
Use
secs_to_jiffies()instead ofmsecs_to_jiffies()and avoid scaling the timeouts to milliseconds.
Applied to 6.16/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen
Martin K. Petersen
AppliedQuoted 6 lines · Thorsten Blum
Use
secs_to_jiffies()instead ofmsecs_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
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering