isci: Collapsing of phy_type data structure

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / scsi / isci / core / scic_sds_phy.h

diff --git a/drivers/scsi/isci/core/scic_sds_phy.h b/drivers/scsi/isci/core/scic_sds_phy.h
index 7bf95539b2a04efceb3e52819d347530990b1bc5..47b2194574a09d0ad721883f654faca2c37c5d4f 100644 (file)
--- a/drivers/scsi/isci/core/scic_sds_phy.h
+++ b/drivers/scsi/isci/core/scic_sds_phy.h
@@ -273,16 +273,8 @@ struct scic_sds_phy {
        bool is_in_link_training;
 
        union {
-               struct {
-                       struct sas_identify_frame identify_address_frame_buffer;
-
-               } sas;
-
-               struct {
-                       struct dev_to_host_fis signature_fis_buffer;
-
-               } sata;
-
+               struct sas_identify_frame sas_id_frame;
+               struct dev_to_host_fis sata_sig_fis;
        } phy_type;
 
        /**