8368 remove warlock leftovers from usr/src/uts

@@ -140,21 +140,10 @@
 
 static fctl_nwwn_list_t         *fctl_nwwn_hash_table;
 static kmutex_t                 fctl_nwwn_hash_mutex;
 int fctl_nwwn_table_size = NWWN_HASH_TABLE_SIZE;
 
-#if     !defined(lint)
-_NOTE(MUTEX_PROTECTS_DATA(fctl_nwwn_hash_mutex, fctl_nwwn_hash_table))
-_NOTE(MUTEX_PROTECTS_DATA(fctl_ulp_list_mutex, fctl_ulp_list))
-_NOTE(RWLOCK_PROTECTS_DATA(fctl_ulp_lock, ulp_module::mod_next))
-_NOTE(RWLOCK_PROTECTS_DATA(fctl_mod_ports_lock, ulp_module::mod_ports
-    ulp_ports::port_handle))
-_NOTE(DATA_READABLE_WITHOUT_LOCK(ulp_module::mod_info))
-_NOTE(MUTEX_PROTECTS_DATA(ulp_ports::port_mutex, ulp_ports::port_statec
-    ulp_ports::port_dstate))
-#endif /* lint */
-
 #define FCTL_VERSION            "20090729-1.70"
 #define FCTL_NAME_VERSION       "SunFC Transport v" FCTL_VERSION
 
 char *fctl_version = FCTL_NAME_VERSION;
 

@@ -1914,13 +1903,11 @@
  *              Should be called from FCA _init routine.
  */
 void
 fc_fca_init(struct dev_ops *fca_devops_p)
 {
-#ifndef __lock_lint
         fca_devops_p->devo_bus_ops = &fctl_fca_busops;
-#endif  /* __lock_lint */
 }
 
 
 /*
  * fc_fca_attach

@@ -2441,13 +2428,11 @@
                 ulp_port = fctl_get_ulp_port(mod, port);
                 if (ulp_port == NULL) {
                         continue;
                 }
 
-#ifndef __lock_lint
                 ASSERT((ulp_port->port_dstate & ULP_PORT_ATTACH) == 0);
-#endif /* __lock_lint */
 
                 (void) fctl_remove_ulp_port(mod, port);
         }
 
         rw_exit(&fctl_mod_ports_lock);

@@ -3880,12 +3865,10 @@
 
         return (pd);
 }
 
 
-#ifndef __lock_lint             /* uncomment when there is a consumer */
-
 void
 fc_ulp_hold_remote_port(opaque_t port_handle)
 {
         fc_remote_port_t *pd = port_handle;
 

@@ -3934,12 +3917,10 @@
         mutex_exit(&port->fp_mutex);
 
         return (pd);
 }
 
-#endif /* __lock_lint */
-
 /*
  * Looks in the pwwn table of the specified fc_local_port_t for the
  * fc_remote_port_t that matches the given pwwn.  Hashes based upon the
  * given pwwn->raw_wwn. Returns a pointer to the fc_remote_port_t struct,
  * but does not update any reference counts or otherwise indicate that

@@ -4304,14 +4285,12 @@
                 job->job_cb_arg = arg;
                 job->job_comp = comp;
                 job->job_private = NULL;
                 job->job_ulp_pkts = NULL;
                 job->job_ulp_listlen = 0;
-#ifndef __lock_lint
                 job->job_counter = 0;
                 job->job_next = NULL;
-#endif /* __lock_lint */
         }
 
         return (job);
 }