[SCSI] zfcp: Move WKA port to zfcp FC code

The well-known-address (WKA) port handling code is part of the FC code
in zfcp. Move everything WKA related to the zfcp_fc files and use the
common zfcp_fc prefix for structs and functions. Drop the unused key
management service while renaming the struct, no request could ever
reach this service in zfcp and it is obsolete anyway.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 2 insertions, 29 deletions

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index c64821145475..c00aa2b174a1 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -104,14 +104,6 @@
 #define ZFCP_STATUS_PORT_PHYS_OPEN              0x00000001
 #define ZFCP_STATUS_PORT_LINK_TEST              0x00000002
 
-/* well known address (WKA) port status*/
-enum zfcp_wka_status {
-        ZFCP_WKA_PORT_OFFLINE,
-        ZFCP_WKA_PORT_CLOSING,
-        ZFCP_WKA_PORT_OPENING,
-        ZFCP_WKA_PORT_ONLINE,
-};
-
 /* logical unit status */
 #define ZFCP_STATUS_UNIT_SHARED                 0x00000004
 #define ZFCP_STATUS_UNIT_READONLY               0x00000008
@@ -155,7 +147,7 @@ struct zfcp_adapter_mempool {
  * @status: used to pass error status to calling function
  */
 struct zfcp_send_ct {
-        struct zfcp_wka_port *wka_port;
+        struct zfcp_fc_wka_port *wka_port;
         struct scatterlist *req;
         struct scatterlist *resp;
         void (*handler)(unsigned long);
@@ -190,25 +182,6 @@ struct zfcp_send_els {
         int status;
 };
 
-struct zfcp_wka_port {
-        struct zfcp_adapter     *adapter;
-        wait_queue_head_t       completion_wq;
-        enum zfcp_wka_status    status;
-        atomic_t                refcount;
-        u32                     d_id;
-        u32                     handle;
-        struct mutex            mutex;
-        struct delayed_work     work;
-};
-
-struct zfcp_wka_ports {
-        struct zfcp_wka_port ms;        /* management service */
-        struct zfcp_wka_port ts;        /* time service */
-        struct zfcp_wka_port ds;        /* directory service */
-        struct zfcp_wka_port as;        /* alias service */
-        struct zfcp_wka_port ks;        /* key distribution service */
-};
-
 struct zfcp_qdio_queue {
         struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q];
         u8                 first;       /* index of next free bfr in queue */
@@ -309,7 +282,7 @@ struct zfcp_adapter {
         u32                     erp_low_mem_count; /* nr of erp actions waiting
                                                       for memory */
         struct task_struct      *erp_thread;
-        struct zfcp_wka_ports   *gs;               /* generic services */
+        struct zfcp_fc_wka_ports *gs;              /* generic services */
         struct zfcp_dbf         *dbf;              /* debug traces */
         struct zfcp_adapter_mempool     pool;      /* Adapter memory pools */
         struct fc_host_statistics *fc_stats;