8368 remove warlock leftovers from usr/src/uts

@@ -276,14 +276,12 @@
         if (ddi_soft_state_zalloc(scsa1394_statep, instance) != 0) {
                 return (DDI_FAILURE);
         }
         sp = SCSA1394_INST2STATE(instance);
 
-#ifndef __lock_lint
         sp->s_dip = dip;
         sp->s_instance = instance;
-#endif
         mutex_init(&sp->s_mutex, NULL, MUTEX_DRIVER,
             sp->s_attachinfo.iblock_cookie);
         cv_init(&sp->s_event_cv, NULL, CV_DRIVER, NULL);
 
         if (scsa1394_attach_1394(sp) != DDI_SUCCESS) {

@@ -323,13 +321,11 @@
         (void) pm_raise_power(dip, 0, PM_LEVEL_D0);
 
         /* we are done */
         (void) pm_idle_component(dip, 0);
 
-#ifndef __lock_lint
         sp->s_dev_state = SCSA1394_DEV_ONLINE;
-#endif
 
         ddi_report_dev(dip);
 
         return (DDI_SUCCESS);
 }

@@ -1060,13 +1056,11 @@
         /* standard probe issues INQUIRY, which some devices may not support */
         if (scsi_hba_probe(sd, waitfunc) != SCSIPROBE_EXISTS) {
                 lp->l_nosup_inquiry = B_TRUE;
                 scsa1394_sbp2_fake_inquiry(sp, &lp->l_fake_inq);
                 bcopy(&lp->l_fake_inq, sd->sd_inq, SUN_INQSIZE);
-#ifndef __lock_lint
                 lp->l_rmb_orig = 1;
-#endif
         }
 
         if (scsa1394_wrka_fake_rmb) {
                 sd->sd_inq->inq_rmb = 1;
         }