scsi: lpfc: convert timeouts to secs_to_jiffies()

Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced
secs_to_jiffies().  As the value here is a multiple of 1000, use
secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication.

This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with
the following Coccinelle rules:

@@ constant C; @@

- msecs_to_jiffies(C * 1000)
+ secs_to_jiffies(C)

@@ constant C; @@

- msecs_to_jiffies(C * MSEC_PER_SEC)
+ secs_to_jiffies(C)

Link: https://lkml.kernel.org/r/20241210-converge-secs-to-jiffies-v3-9-ddfefd7e9f2a@linux.microsoft.com
Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>
Cc: Anna-Maria Behnsen <anna-maria@linutronix.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Daniel Mack <daniel@zonque.org>
Cc: David Airlie <airlied@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dick Kennedy <dick.kennedy@broadcom.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Florian Fainelli <florian.fainelli@broadcom.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: Jack Wang <jinpu.wang@cloud.ionos.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: James Smart <james.smart@broadcom.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Jeff Johnson <jjohnson@kernel.org>
Cc: Jeff Johnson <quic_jjohnson@quicinc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jeroen de Borst <jeroendb@google.com>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Joe Lawrence <joe.lawrence@redhat.com>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Julia Lawall <julia.lawall@inria.fr>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: Louis Peens <louis.peens@corigine.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Miroslav Benes <mbenes@suse.cz>
Cc: Naveen N Rao <naveen@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Nicolas Palix <nicolas.palix@imag.fr>
Cc: Oded Gabbay <ogabbay@kernel.org>
Cc: Ofir Bitton <obitton@habana.ai>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Praveen Kaligineedi <pkaligineedi@google.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Roger Pau Monné <roger.pau@citrix.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: Shailend Chand <shailend@google.com>
Cc: Simona Vetter <simona@ffwll.ch>
Cc: Simon Horman <horms@kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 7f57397..4fed2e1 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -598,7 +598,7 @@ lpfc_config_port_post(struct lpfc_hba *phba)
                  jiffies + msecs_to_jiffies(1000 * timeout));
        /* Set up heart beat (HB) timer */
        mod_timer(&phba->hb_tmofunc,
-                 jiffies + msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL));
+                 jiffies + secs_to_jiffies(LPFC_HB_MBOX_INTERVAL));
        clear_bit(HBA_HBEAT_INP, &phba->hba_flag);
        clear_bit(HBA_HBEAT_TMO, &phba->hba_flag);
        phba->last_completion_time = jiffies;
@@ -1267,7 +1267,7 @@ lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
            !test_bit(FC_UNLOADING, &phba->pport->load_flag))
                mod_timer(&phba->hb_tmofunc,
                          jiffies +
-                         msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL));
+                         secs_to_jiffies(LPFC_HB_MBOX_INTERVAL));
        return;
 }
 
@@ -1555,7 +1555,7 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba)
                /* If IOs are completing, no need to issue a MBX_HEARTBEAT */
                spin_lock_irq(&phba->pport->work_port_lock);
                if (time_after(phba->last_completion_time +
-                               msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL),
+                               secs_to_jiffies(LPFC_HB_MBOX_INTERVAL),
                                jiffies)) {
                        spin_unlock_irq(&phba->pport->work_port_lock);
                        if (test_bit(HBA_HBEAT_INP, &phba->hba_flag))
@@ -3354,7 +3354,7 @@ lpfc_block_mgmt_io(struct lpfc_hba *phba, int mbx_action)
        spin_unlock_irqrestore(&phba->hbalock, iflag);
        if (mbx_action == LPFC_MBX_NO_WAIT)
                return;
-       timeout = msecs_to_jiffies(LPFC_MBOX_TMO * 1000) + jiffies;
+       timeout = secs_to_jiffies(LPFC_MBOX_TMO) + jiffies;
        spin_lock_irqsave(&phba->hbalock, iflag);
        if (phba->sli.mbox_active) {
                actcmd = phba->sli.mbox_active->u.mb.mbxCommand;
@@ -4924,14 +4924,14 @@ int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)
                stat = 1;
                goto finished;
        }
-       if (time >= msecs_to_jiffies(30 * 1000)) {
+       if (time >= secs_to_jiffies(30)) {
                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                "0461 Scanning longer than 30 "
                                "seconds.  Continuing initialization\n");
                stat = 1;
                goto finished;
        }
-       if (time >= msecs_to_jiffies(15 * 1000) &&
+       if (time >= secs_to_jiffies(15) &&
            phba->link_state <= LPFC_LINK_DOWN) {
                lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                "0465 Link down longer than 15 "
@@ -4945,7 +4945,7 @@ int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)
        if (vport->num_disc_nodes || vport->fc_prli_sent)
                goto finished;
        if (!atomic_read(&vport->fc_map_cnt) &&
-           time < msecs_to_jiffies(2 * 1000))
+           time < secs_to_jiffies(2))
                goto finished;
        if ((phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE) != 0)
                goto finished;
@@ -5179,8 +5179,8 @@ lpfc_vmid_poll(struct timer_list *t)
                lpfc_worker_wake_up(phba);
 
        /* restart the timer for the next iteration */
-       mod_timer(&phba->inactive_vmid_poll, jiffies + msecs_to_jiffies(1000 *
-                                                       LPFC_VMID_TIMER));
+       mod_timer(&phba->inactive_vmid_poll,
+                 jiffies + secs_to_jiffies(LPFC_VMID_TIMER));
 }
 
 /**

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 4d88cfe..08a7f5c 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -906,7 +906,7 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                    (ndlp->nlp_state >= NLP_STE_ADISC_ISSUE ||
                     ndlp->nlp_state <= NLP_STE_PRLI_ISSUE)) {
                        mod_timer(&ndlp->nlp_delayfunc,
-                                 jiffies + msecs_to_jiffies(1000 * 1));
+                                 jiffies + secs_to_jiffies(1));
                        set_bit(NLP_DELAY_TMO, &ndlp->nlp_flag);
                        ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
                        lpfc_printf_vlog(vport, KERN_INFO,
@@ -1332,7 +1332,7 @@ lpfc_rcv_els_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        }
 
        /* Put ndlp in npr state set plogi timer for 1 sec */
-       mod_timer(&ndlp->nlp_delayfunc, jiffies + msecs_to_jiffies(1000 * 1));
+       mod_timer(&ndlp->nlp_delayfunc, jiffies + secs_to_jiffies(1));
        set_bit(NLP_DELAY_TMO, &ndlp->nlp_flag);
        ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
        ndlp->nlp_prev_state = NLP_STE_PLOGI_ISSUE;
@@ -1936,7 +1936,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,
 
                /* Put ndlp in npr state set plogi timer for 1 sec */
                mod_timer(&ndlp->nlp_delayfunc,
-                         jiffies + msecs_to_jiffies(1000 * 1));
+                         jiffies + secs_to_jiffies(1));
                set_bit(NLP_DELAY_TMO, &ndlp->nlp_flag);
                ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
 
@@ -2743,7 +2743,7 @@ lpfc_rcv_prlo_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
 
        if (!test_bit(NLP_DELAY_TMO, &ndlp->nlp_flag)) {
                mod_timer(&ndlp->nlp_delayfunc,
-                         jiffies + msecs_to_jiffies(1000 * 1));
+                         jiffies + secs_to_jiffies(1));
                set_bit(NLP_DELAY_TMO, &ndlp->nlp_flag);
                clear_bit(NLP_NPR_ADISC, &ndlp->nlp_flag);
                ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;

diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index 43dc1da..b1adb9f 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nvme.c
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
@@ -2237,7 +2237,7 @@ lpfc_nvme_lport_unreg_wait(struct lpfc_vport *vport,
         * wait. Print a message if a 10 second wait expires and renew the
         * wait. This is unexpected.
         */
-       wait_tmo = msecs_to_jiffies(LPFC_NVME_WAIT_TMO * 1000);
+       wait_tmo = secs_to_jiffies(LPFC_NVME_WAIT_TMO);
        while (true) {
                ret = wait_for_completion_timeout(lport_unreg_cmp, wait_tmo);
                if (unlikely(!ret)) {

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 874644b..3fd9723 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -9012,7 +9012,7 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)
 
        /* Start heart beat timer */
        mod_timer(&phba->hb_tmofunc,
-                 jiffies + msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL));
+                 jiffies + secs_to_jiffies(LPFC_HB_MBOX_INTERVAL));
        clear_bit(HBA_HBEAT_INP, &phba->hba_flag);
        clear_bit(HBA_HBEAT_TMO, &phba->hba_flag);
        phba->last_completion_time = jiffies;
@@ -13323,7 +13323,7 @@ lpfc_sli_mbox_sys_shutdown(struct lpfc_hba *phba, int mbx_action)
                lpfc_sli_mbox_sys_flush(phba);
                return;
        }
-       timeout = msecs_to_jiffies(LPFC_MBOX_TMO * 1000) + jiffies;
+       timeout = secs_to_jiffies(LPFC_MBOX_TMO) + jiffies;
 
        /* Disable softirqs, including timers from obtaining phba->hbalock */
        local_bh_disable();

diff --git a/drivers/scsi/lpfc/lpfc_vmid.c b/drivers/scsi/lpfc/lpfc_vmid.c
index cc3e473..14dbfe9 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_vmid.c
+++ b/drivers/scsi/lpfc/lpfc_vmid.c
@@ -278,7 +278,7 @@ int lpfc_vmid_get_appid(struct lpfc_vport *vport, char *uuid,
                if (!(vport->phba->pport->vmid_flag & LPFC_VMID_TIMER_ENBLD)) {
                        mod_timer(&vport->phba->inactive_vmid_poll,
                                  jiffies +
-                                 msecs_to_jiffies(1000 * LPFC_VMID_TIMER));
+                                 secs_to_jiffies(LPFC_VMID_TIMER));
                        vport->phba->pport->vmid_flag |= LPFC_VMID_TIMER_ENBLD;
                }
        }