Print this page
XXXX introduce drv_sectohz

@@ -2161,11 +2161,11 @@
                 cmn_err(CE_WARN, "iwh_load_init_firmware(): "
                     "failed to write init uCode.\n");
                 return (err);
         }
 
-        clk = ddi_get_lbolt() + drv_usectohz(1000000);
+        clk = ddi_get_lbolt() + drv_sectohz(1);
 
         /*
          * wait loading init_text until completed or timeout
          */
         while (!(sc->sc_flags & IWH_F_PUT_SEG)) {

@@ -2191,11 +2191,11 @@
                 cmn_err(CE_WARN, "iwh_load_init_firmware(): "
                     "failed to write init_data uCode.\n");
                 return (err);
         }
 
-        clk = ddi_get_lbolt() + drv_usectohz(1000000);
+        clk = ddi_get_lbolt() + drv_sectohz(1);
 
         /*
          * wait loading init_data until completed or timeout
          */
         while (!(sc->sc_flags & IWH_F_PUT_SEG)) {

@@ -2232,11 +2232,11 @@
                 cmn_err(CE_WARN, "iwh_load_run_firmware(): "
                     "failed to write run uCode.\n");
                 return (err);
         }
 
-        clk = ddi_get_lbolt() + drv_usectohz(1000000);
+        clk = ddi_get_lbolt() + drv_sectohz(1);
 
         /*
          * wait loading run_text until completed or timeout
          */
         while (!(sc->sc_flags & IWH_F_PUT_SEG)) {

@@ -2262,11 +2262,11 @@
                 cmn_err(CE_WARN, "iwh_load_run_firmware(): "
                     "failed to write run_data uCode.\n");
                 return (err);
         }
 
-        clk = ddi_get_lbolt() + drv_usectohz(1000000);
+        clk = ddi_get_lbolt() + drv_sectohz(1);
 
         /*
          * wait loading run_data until completed or timeout
          */
         while (!(sc->sc_flags & IWH_F_PUT_SEG)) {

@@ -3870,11 +3870,11 @@
                  * rate ctl
                  */
                 if (ic->ic_mach &&
                     (sc->sc_flags & IWH_F_RATE_AUTO_CTL)) {
                         clk = ddi_get_lbolt();
-                        if (clk > sc->sc_clk + drv_usectohz(1000000)) {
+                        if (clk > sc->sc_clk + drv_sectohz(1)) {
                                 iwh_amrr_timeout(sc);
                         }
                 }
 
                 if ((ic->ic_state == IEEE80211_S_RUN) &&

@@ -4827,11 +4827,11 @@
         /*
          * now press "execute" start running
          */
         IWH_WRITE(sc, CSR_RESET, 0);
 
-        clk = ddi_get_lbolt() + drv_usectohz(1000000);
+        clk = ddi_get_lbolt() + drv_sectohz(1);
         while (!(sc->sc_flags & IWH_F_FW_INIT)) {
                 if (cv_timedwait(&sc->sc_ucode_cv,
                     &sc->sc_glock, clk) < 0) {
                         break;
                 }

@@ -4874,11 +4874,11 @@
         /*
          * now press "execute" start running
          */
         IWH_WRITE(sc, CSR_RESET, 0);
 
-        clk = ddi_get_lbolt() + drv_usectohz(1000000);
+        clk = ddi_get_lbolt() + drv_sectohz(1);
         while (!(sc->sc_flags & IWH_F_FW_INIT)) {
                 if (cv_timedwait(&sc->sc_ucode_cv,
                     &sc->sc_glock, clk) < 0) {
                         break;
                 }