[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>
diff --git a/drivers/s390/scsi/zfcp_fsf.h b/drivers/s390/scsi/zfcp_fsf.h
index 6ce2f1e..bf94b4d 100644
--- a/drivers/s390/scsi/zfcp_fsf.h
+++ b/drivers/s390/scsi/zfcp_fsf.h
@@ -287,29 +287,6 @@
u32 current_transmit_b2b_credit;
} __attribute__ ((packed));
-struct fsf_status_read_buffer {
- u32 status_type;
- u32 status_subtype;
- u32 length;
- u32 res1;
- struct fsf_queue_designator queue_designator;
- u32 d_id;
- u32 class;
- u64 fcp_lun;
- u8 res3[24];
- u8 payload[FSF_STATUS_READ_PAYLOAD_SIZE];
-} __attribute__ ((packed));
-
-struct fsf_qual_version_error {
- u32 fsf_version;
- u32 res1[3];
-} __attribute__ ((packed));
-
-struct fsf_qual_sequence_error {
- u32 exp_req_seq_no;
- u32 res1[3];
-} __attribute__ ((packed));
-
struct fsf_link_down_info {
u32 error_code;
u32 res1;
@@ -322,6 +299,34 @@
u8 vendor_specific_code;
} __attribute__ ((packed));
+struct fsf_status_read_buffer {
+ u32 status_type;
+ u32 status_subtype;
+ u32 length;
+ u32 res1;
+ struct fsf_queue_designator queue_designator;
+ u32 d_id;
+ u32 class;
+ u64 fcp_lun;
+ u8 res3[24];
+ 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 {
+ u32 fsf_version;
+ u32 res1[3];
+} __attribute__ ((packed));
+
+struct fsf_qual_sequence_error {
+ u32 exp_req_seq_no;
+ u32 res1[3];
+} __attribute__ ((packed));
+
struct fsf_qual_latency_info {
u32 channel_lat;
u32 fabric_lat;