Print this page
XXXX introduce drv_sectohz

@@ -4057,11 +4057,11 @@
                                                 break;
                                         }
 
                                         if (!i_ddi_devi_attached(cdip)) {
                                                 mutex_exit(&plun->lun_mutex);
-                                                delay(drv_usectohz(1000000));
+                                                delay(drv_sectohz(1));
                                                 mutex_enter(&plun->lun_mutex);
                                         } else {
                                                 /*
                                                  * This Lun is ready, lets
                                                  * check the next one.

@@ -4428,11 +4428,11 @@
 
                 pptr->port_link_cnt++;
 
                 while (pptr->port_ipkt_cnt) {
                         mutex_exit(&pptr->port_mutex);
-                        delay(drv_usectohz(1000000));
+                        delay(drv_sectohz(1));
                         mutex_enter(&pptr->port_mutex);
                 }
 
                 pptr->port_topology = port_top;
 

@@ -4782,11 +4782,11 @@
                                         mutex_enter(&ptgt->tgt_mutex);
                                         while (ptgt->tgt_ipkt_cnt ||
                                             fcp_outstanding_lun_cmds(ptgt)
                                             == FC_SUCCESS) {
                                                 mutex_exit(&ptgt->tgt_mutex);
-                                                delay(drv_usectohz(1000000));
+                                                delay(drv_sectohz(1));
                                                 mutex_enter(&ptgt->tgt_mutex);
                                         }
                                         mutex_exit(&ptgt->tgt_mutex);
 
                                         mutex_enter(&pptr->port_mutex);

@@ -10005,12 +10005,11 @@
         pptr->port_next = fcp_port_head;
         fcp_port_head = pptr;
         soft_state_linked++;
 
         if (fcp_watchdog_init++ == 0) {
-                fcp_watchdog_tick = fcp_watchdog_timeout *
-                    drv_usectohz(1000000);
+                fcp_watchdog_tick = drv_sectohz(fcp_watchdog_timeout);
                 fcp_watchdog_id = timeout(fcp_watch, NULL,
                     fcp_watchdog_tick);
         }
         mutex_exit(&fcp_global_mutex);
 

@@ -10296,11 +10295,11 @@
                  */
                 if (count++ >= FCP_ICMD_DEADLINE) {
                         break;
                 }
                 mutex_exit(&pptr->port_mutex);
-                delay(drv_usectohz(1000000));
+                delay(drv_sectohz(1));
                 mutex_enter(&pptr->port_mutex);
         }
 
         /*
          * if the driver is still busy then fail to

@@ -12210,12 +12209,11 @@
          */
         (void) fcp_cp_pinfo(pptr, pinfo);
 
         mutex_enter(&fcp_global_mutex);
         if (fcp_watchdog_init++ == 0) {
-                fcp_watchdog_tick = fcp_watchdog_timeout *
-                    drv_usectohz(1000000);
+                fcp_watchdog_tick = drv_sectohz(fcp_watchdog_timeout);
                 fcp_watchdog_id = timeout(fcp_watch,
                     NULL, fcp_watchdog_tick);
         }
         mutex_exit(&fcp_global_mutex);