3 files changed, 3 insertions, 28 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index f0f49feaa34f..d7d3148d15e2 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -181,7 +181,6 @@ static int __init zfcp_module_init(void)
 
         zfcp_data.work_queue = create_singlethread_workqueue("zfcp_wq");
 
-        INIT_LIST_HEAD(&zfcp_data.adapter_list_head);
         sema_init(&zfcp_data.config_sema, 1);
         rwlock_init(&zfcp_data.config_lock);
 
@@ -527,11 +526,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
                                &zfcp_sysfs_adapter_attrs))
                 goto sysfs_failed;
 
-        write_lock_irq(&zfcp_data.config_lock);
         atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);
-        list_add_tail(&adapter->list, &zfcp_data.adapter_list_head);
-        write_unlock_irq(&zfcp_data.config_lock);
-
         zfcp_fc_nameserver_init(adapter);
 
         if (!zfcp_adapter_scsi_register(adapter))
@@ -574,14 +569,7 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter)
                 return;
 
         zfcp_adapter_debug_unregister(adapter);
-
-        /* remove specified adapter data structure from list */
-        write_lock_irq(&zfcp_data.config_lock);
-        list_del(&adapter->list);
-        write_unlock_irq(&zfcp_data.config_lock);
-
         zfcp_qdio_free(adapter);
-
         zfcp_free_low_mem_buffers(adapter);
         kfree(adapter->req_list);
         kfree(adapter->fc_stats);
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c
index f1a7518e67ed..10cbfd172a28 100644
--- a/drivers/s390/scsi/zfcp_cfdc.c
+++ b/drivers/s390/scsi/zfcp_cfdc.c
@@ -85,20 +85,9 @@ static int zfcp_cfdc_copy_to_user(void __user  *user_buffer,
 
 static struct zfcp_adapter *zfcp_cfdc_get_adapter(u32 devno)
 {
-        struct zfcp_adapter *adapter = NULL, *cur_adapter;
-        struct ccw_dev_id dev_id;
-
-        read_lock_irq(&zfcp_data.config_lock);
-        list_for_each_entry(cur_adapter, &zfcp_data.adapter_list_head, list) {
-                ccw_device_get_id(cur_adapter->ccw_device, &dev_id);
-                if (dev_id.devno == devno) {
-                        adapter = cur_adapter;
-                        zfcp_adapter_get(adapter);
-                        break;
-                }
-        }
-        read_unlock_irq(&zfcp_data.config_lock);
-        return adapter;
+        char busid[9];
+        snprintf(busid, sizeof(busid), "0.0.%04x", devno);
+        return zfcp_get_adapter_by_busid(busid);
 }
 
 static int zfcp_cfdc_set_fsf(struct zfcp_fsf_cfdc *fsf_cfdc, int command)
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index e19e46ae4a68..b95e73ee0d6f 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -451,7 +451,6 @@ struct zfcp_latencies {
 };
 
 struct zfcp_adapter {
-        struct list_head        list;              /* list of adapters */
         atomic_t                refcount;          /* reference count */
         wait_queue_head_t       remove_wq;         /* can be used to wait for
                                                       refcount drop to zero */
@@ -593,7 +592,6 @@ struct zfcp_fsf_req {
 struct zfcp_data {
         struct scsi_host_template scsi_host_template;
         struct scsi_transport_template *scsi_transport_template;
-        struct list_head        adapter_list_head;  /* head of adapter list */
         rwlock_t                config_lock;        /* serialises changes
                                                        to adapter/port/unit
                                                        lists */