Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / scsi / bnx2fc / bnx2fc_fcoe.c

diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index a5052dd..f9ddb61 100644 (file)
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -625,7 +625,7 @@ static void bnx2fc_recv_frame(struct sk_buff *skb)
  *
  * @arg:       ptr to bnx2fc_percpu_info structure
  */
-int bnx2fc_percpu_io_thread(void *arg)
+static int bnx2fc_percpu_io_thread(void *arg)
 {
        struct bnx2fc_percpu_s *p = arg;
        struct bnx2fc_work *work, *tmp;
@@ -1410,9 +1410,10 @@ bind_err:
        return NULL;
 }
 
-struct bnx2fc_interface *bnx2fc_interface_create(struct bnx2fc_hba *hba,
-                                     struct net_device *netdev,
-                                     enum fip_state fip_mode)
+static struct bnx2fc_interface *
+bnx2fc_interface_create(struct bnx2fc_hba *hba,
+                       struct net_device *netdev,
+                       enum fip_state fip_mode)
 {
        struct fcoe_ctlr_device *ctlr_dev;
        struct bnx2fc_interface *interface;
@@ -2765,8 +2766,7 @@ static void __exit bnx2fc_mod_exit(void)
         * held.
         */
        mutex_lock(&bnx2fc_dev_lock);
-       list_splice(&adapter_list, &to_be_deleted);
-       INIT_LIST_HEAD(&adapter_list);
+       list_splice_init(&adapter_list, &to_be_deleted);
        adapter_count = 0;
        mutex_unlock(&bnx2fc_dev_lock);