[SCSI] zfcp: zfcp_fsf cleanup.

Code cleanup for the zfcp_fsf.c file.

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

1 files changed, 18 insertions, 13 deletions

diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h
index 6ce2f1e4b00e..bf94b4da0763 100644
--- a/drivers/s390/scsi/zfcp_fsf.h
+++ b/drivers/s390/scsi/zfcp_fsf.h
@@ -287,6 +287,18 @@ struct fsf_bit_error_payload {
         u32 current_transmit_b2b_credit;
 } __attribute__ ((packed));
 
+struct fsf_link_down_info {
+        u32 error_code;
+        u32 res1;
+        u8 res2[2];
+        u8 primary_status;
+        u8 ioerr_code;
+        u8 action_code;
+        u8 reason_code;
+        u8 explanation_code;
+        u8 vendor_specific_code;
+} __attribute__ ((packed));
+
 struct fsf_status_read_buffer {
         u32 status_type;
         u32 status_subtype;
@@ -297,7 +309,12 @@ struct fsf_status_read_buffer {
         u32 class;
         u64 fcp_lun;
         u8  res3[24];
-        u8  payload[FSF_STATUS_READ_PAYLOAD_SIZE];
+        union {
+                u8  data[FSF_STATUS_READ_PAYLOAD_SIZE];
+                u32 word[FSF_STATUS_READ_PAYLOAD_SIZE/sizeof(u32)];
+                struct fsf_link_down_info link_down_info;
+                struct fsf_bit_error_payload bit_error;
+        } payload;
 } __attribute__ ((packed));
 
 struct fsf_qual_version_error {
@@ -310,18 +327,6 @@ struct fsf_qual_sequence_error {
         u32 res1[3];
 } __attribute__ ((packed));
 
-struct fsf_link_down_info {
-        u32 error_code;
-        u32 res1;
-        u8 res2[2];
-        u8 primary_status;
-        u8 ioerr_code;
-        u8 action_code;
-        u8 reason_code;
-        u8 explanation_code;
-        u8 vendor_specific_code;
-} __attribute__ ((packed));
-
 struct fsf_qual_latency_info {
         u32 channel_lat;
         u32 fabric_lat;