[SCSI] zfcp: Move debug data from zfcp_data to own data structure

The struct zfcp_adapter includes everything related to the debug
traces. This introduces dependences between the definitions in
zfcp_def.h and zfcp_dbf.h. Move all debug related data structures to a
new data structure to break those dependencies and manage the debug
data in zfcp_dbf.[hc].

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, 1 insertions, 14 deletions

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 49d0532bca1c..601f5a575def 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -37,10 +37,8 @@
 #include <asm/debug.h>
 #include <asm/ebcdic.h>
 #include <asm/sysinfo.h>
-#include "zfcp_dbf.h"
 #include "zfcp_fsf.h"
 
-
 /********************* GENERAL DEFINES *********************************/
 
 #define REQUEST_LIST_SIZE 128
@@ -468,18 +466,7 @@ struct zfcp_adapter {
         u32                     erp_low_mem_count; /* nr of erp actions waiting
                                                       for memory */
         struct zfcp_wka_ports   *gs;               /* generic services */
-        debug_info_t            *rec_dbf;
-        debug_info_t            *hba_dbf;
-        debug_info_t            *san_dbf;          /* debug feature areas */
-        debug_info_t            *scsi_dbf;
-        spinlock_t              rec_dbf_lock;
-        spinlock_t              hba_dbf_lock;
-        spinlock_t              san_dbf_lock;
-        spinlock_t              scsi_dbf_lock;
-        struct zfcp_rec_dbf_record      rec_dbf_buf;
-        struct zfcp_hba_dbf_record      hba_dbf_buf;
-        struct zfcp_san_dbf_record      san_dbf_buf;
-        struct zfcp_scsi_dbf_record     scsi_dbf_buf;
+        struct zfcp_dbf         *dbf;              /* debug traces */
         struct zfcp_adapter_mempool     pool;      /* Adapter memory pools */
         struct qdio_initialize  qdio_init_data;    /* for qdio_establish */
         struct fc_host_statistics *fc_stats;