8368 remove warlock leftovers from usr/src/uts

@@ -223,23 +223,19 @@
 
         rdsv3_af_grp_destroy(rds_ibdev->aft_hcagp);
 
 #if 0
         while (ib_dealloc_pd(rds_ibdev->pd)) {
-#ifndef __lock_lint
                 RDSV3_DPRINTF5("rdsv3_ib_remove_one",
                     "%s-%d Failed to dealloc pd %p",
                     __func__, __LINE__, rds_ibdev->pd);
-#endif
                 delay(drv_usectohz(1000));
         }
 #else
         if (ib_dealloc_pd(rds_ibdev->pd)) {
-#ifndef __lock_lint
                 RDSV3_DPRINTF2("rdsv3_ib_remove_one",
                     "Failed to dealloc pd %p\n", rds_ibdev->pd);
-#endif
         }
 #endif
 
         list_destroy(&rds_ibdev->ipaddr_list);
         list_destroy(&rds_ibdev->conn_list);

@@ -249,28 +245,17 @@
         kmem_free(rds_ibdev, sizeof (*rds_ibdev));
 
         RDSV3_DPRINTF2("rdsv3_ib_remove_one", "Return: device: %p", device);
 }
 
-#ifndef __lock_lint
 struct ib_client rdsv3_ib_client = {
         .name           = "rdsv3_ib",
         .add            = rdsv3_ib_add_one,
         .remove         = rdsv3_ib_remove_one,
         .clnt_hdl       = NULL,
         .state          = IB_CLNT_UNINITIALIZED
 };
-#else
-struct ib_client rdsv3_ib_client = {
-        "rdsv3_ib",
-        rdsv3_ib_add_one,
-        rdsv3_ib_remove_one,
-        NULL,
-        NULL,
-        IB_CLNT_UNINITIALIZED
-};
-#endif
 
 static int
 rds_ib_conn_info_visitor(struct rdsv3_connection *conn,
     void *buffer)
 {

@@ -392,11 +377,10 @@
         list_destroy(&rdsv3_ib_devices);
 
         RDSV3_DPRINTF4("rds_ib_exit", "Return");
 }
 
-#ifndef __lock_lint
 struct rdsv3_transport rdsv3_ib_transport = {
         .laddr_check            = rds_ib_laddr_check,
         .xmit_complete          = rdsv3_ib_xmit_complete,
         .xmit                   = rdsv3_ib_xmit,
         .xmit_cong_map          = NULL,

@@ -418,13 +402,10 @@
         .free_mr                = rdsv3_ib_free_mr,
         .flush_mrs              = rdsv3_ib_flush_mrs,
         .t_name                 = "infiniband",
         .t_type                 = RDS_TRANS_IB
 };
-#else
-struct rdsv3_transport rdsv3_ib_transport;
-#endif
 
 int
 rdsv3_ib_init(void)
 {
         int ret;