Print this page
8368 remove warlock leftovers from usr/src/uts

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/1394/targets/av1394/av1394.c
          +++ new/usr/src/uts/common/io/1394/targets/av1394/av1394.c
↓ open down ↓ 220 lines elided ↑ open up ↑
 221  221  
 222  222          if (av1394_t1394_attach(avp, dip) != DDI_SUCCESS) {
 223  223                  av1394_cleanup(avp, 1);
 224  224                  AV1394_TNF_EXIT(av1394_attach);
 225  225                  return (DDI_FAILURE);
 226  226          }
 227  227  
 228  228          mutex_init(&avp->av_mutex, NULL, MUTEX_DRIVER,
 229  229              avp->av_attachinfo.iblock_cookie);
 230  230  
 231      -#ifndef __lock_lint
 232  231          avp->av_dip = dip;
 233  232          avp->av_instance = instance;
 234      -#endif
 235  233  
 236  234          if (av1394_add_events(avp) != DDI_SUCCESS) {
 237  235                  av1394_cleanup(avp, 2);
 238  236                  AV1394_TNF_EXIT(av1394_attach);
 239  237                  return (DDI_FAILURE);
 240  238          }
 241  239  
 242  240          if (av1394_isoch_attach(avp) != DDI_SUCCESS) {
 243  241                  av1394_cleanup(avp, 3);
 244  242                  AV1394_TNF_EXIT(av1394_attach);
 245  243                  return (DDI_FAILURE);
 246  244          }
 247  245  
 248  246          if (av1394_async_attach(avp) != DDI_SUCCESS) {
 249  247                  av1394_cleanup(avp, 4);
 250  248                  AV1394_TNF_EXIT(av1394_attach);
 251  249                  return (DDI_FAILURE);
 252  250          }
 253  251  
 254      -#ifndef __lock_lint
 255  252          avp->av_dev_state = AV1394_DEV_ONLINE;
 256      -#endif
 257  253  
 258  254          ddi_report_dev(dip);
 259  255  
 260  256          AV1394_TNF_EXIT(av1394_attach);
 261  257          return (DDI_SUCCESS);
 262  258  }
 263  259  
 264  260  static int
 265  261  av1394_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 266  262  {
↓ open down ↓ 428 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX