Print this page
XXXX introduce drv_sectohz

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c
          +++ new/usr/src/uts/common/io/usb/scsa2usb/scsa2usb.c
↓ open down ↓ 1311 lines elided ↑ open up ↑
1312 1312              "scsa2usb_cleanup:");
1313 1313  
1314 1314          /* wait till the work thread is done */
1315 1315          mutex_enter(&scsa2usbp->scsa2usb_mutex);
1316 1316          for (i = 0; i < SCSA2USB_DRAIN_TIMEOUT; i++) {
1317 1317                  if (scsa2usbp->scsa2usb_work_thread_id == NULL) {
1318 1318  
1319 1319                          break;
1320 1320                  }
1321 1321                  mutex_exit(&scsa2usbp->scsa2usb_mutex);
1322      -                delay(drv_usectohz(1000000));
     1322 +                delay(drv_sectohz(1));
1323 1323                  mutex_enter(&scsa2usbp->scsa2usb_mutex);
1324 1324          }
1325 1325          mutex_exit(&scsa2usbp->scsa2usb_mutex);
1326 1326  
1327 1327          if (i >= SCSA2USB_DRAIN_TIMEOUT) {
1328 1328  
1329 1329                  return (USB_FAILURE);
1330 1330          }
1331 1331  
1332 1332          /*
↓ open down ↓ 4113 lines elided ↑ open up ↑
5446 5446           */
5447 5447          for (i = 0; i < SCSA2USB_DRAIN_TIMEOUT; i++) {
5448 5448                  if ((scsa2usbp->scsa2usb_work_thread_id == NULL) &&
5449 5449                      (scsa2usbp->scsa2usb_cur_pkt == NULL) &&
5450 5450                      (scsa2usb_all_waitQs_empty(scsa2usbp) ==
5451 5451                      USB_SUCCESS)) {
5452 5452  
5453 5453                          break;
5454 5454                  }
5455 5455                  mutex_exit(&scsa2usbp->scsa2usb_mutex);
5456      -                delay(drv_usectohz(1000000));
     5456 +                delay(drv_sectohz(1));
5457 5457                  mutex_enter(&scsa2usbp->scsa2usb_mutex);
5458 5458          }
5459 5459          mutex_exit(&scsa2usbp->scsa2usb_mutex);
5460 5460  
5461 5461          ndi_devi_enter(dip, &circ);
5462 5462          for (cdip = ddi_get_child(dip); cdip; ) {
5463 5463                  dev_info_t *next = ddi_get_next_sibling(cdip);
5464 5464  
5465 5465                  mutex_enter(&DEVI(cdip)->devi_lock);
5466 5466                  DEVI_SET_DEVICE_REMOVED(cdip);
↓ open down ↓ 369 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX