1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/scsi/scsi_sas_internal.h b/drivers/scsi/scsi_sas_internal.h
index e1edab45a37b..998cb5be6833 100644
--- a/drivers/scsi/scsi_sas_internal.h
+++ b/drivers/scsi/scsi_sas_internal.h
@@ -13,12 +13,12 @@ struct sas_internal {
        struct sas_function_template *f;
        struct sas_domain_function_template *dft;
-        struct class_device_attribute private_host_attrs[SAS_HOST_ATTRS];
+        struct device_attribute private_host_attrs[SAS_HOST_ATTRS];
-        struct class_device_attribute private_phy_attrs[SAS_PHY_ATTRS];
+        struct device_attribute private_phy_attrs[SAS_PHY_ATTRS];
-        struct class_device_attribute private_port_attrs[SAS_PORT_ATTRS];
+        struct device_attribute private_port_attrs[SAS_PORT_ATTRS];
-        struct class_device_attribute private_rphy_attrs[SAS_RPORT_ATTRS];
+        struct device_attribute private_rphy_attrs[SAS_RPORT_ATTRS];
-        struct class_device_attribute private_end_dev_attrs[SAS_END_DEV_ATTRS];
+        struct device_attribute private_end_dev_attrs[SAS_END_DEV_ATTRS];
-        struct class_device_attribute private_expander_attrs[SAS_EXPANDER_ATTRS];
+        struct device_attribute private_expander_attrs[SAS_EXPANDER_ATTRS];
        struct transport_container phy_attr_cont;
        struct transport_container port_attr_cont;
@@ -30,12 +30,12 @@ struct sas_internal {
         * The array of null terminated pointers to attributes
         * needed by scsi_sysfs.c
         */
-        struct class_device_attribute *host_attrs[SAS_HOST_ATTRS + 1];
+        struct device_attribute *host_attrs[SAS_HOST_ATTRS + 1];
-        struct class_device_attribute *phy_attrs[SAS_PHY_ATTRS + 1];
+        struct device_attribute *phy_attrs[SAS_PHY_ATTRS + 1];
-        struct class_device_attribute *port_attrs[SAS_PORT_ATTRS + 1];
+        struct device_attribute *port_attrs[SAS_PORT_ATTRS + 1];
-        struct class_device_attribute *rphy_attrs[SAS_RPORT_ATTRS + 1];
+        struct device_attribute *rphy_attrs[SAS_RPORT_ATTRS + 1];
-        struct class_device_attribute *end_dev_attrs[SAS_END_DEV_ATTRS + 1];
+        struct device_attribute *end_dev_attrs[SAS_END_DEV_ATTRS + 1];
-        struct class_device_attribute *expander_attrs[SAS_EXPANDER_ATTRS + 1];
+        struct device_attribute *expander_attrs[SAS_EXPANDER_ATTRS + 1];
 };
 #define to_sas_internal(tmpl)   container_of(tmpl, struct sas_internal, t)

diff --git a/drivers/scsi/scsi_sas_internal.h b/drivers/scsi/scsi_sas_internal.h index e1edab45a37b..998cb5be6833 100644 --- a/drivers/scsi/scsi_sas_internal.h +++ b/drivers/scsi/scsi_sas_internal.h
@@ -13,12 +13,12 @@ struct sas_internal {
13	struct sas_function_template *f;	13	struct sas_function_template *f;
14	struct sas_domain_function_template *dft;	14	struct sas_domain_function_template *dft;
15		15
16	struct class_device_attribute private_host_attrs[SAS_HOST_ATTRS];	16	struct device_attribute private_host_attrs[SAS_HOST_ATTRS];
17	struct class_device_attribute private_phy_attrs[SAS_PHY_ATTRS];	17	struct device_attribute private_phy_attrs[SAS_PHY_ATTRS];
18	struct class_device_attribute private_port_attrs[SAS_PORT_ATTRS];	18	struct device_attribute private_port_attrs[SAS_PORT_ATTRS];
19	struct class_device_attribute private_rphy_attrs[SAS_RPORT_ATTRS];	19	struct device_attribute private_rphy_attrs[SAS_RPORT_ATTRS];
20	struct class_device_attribute private_end_dev_attrs[SAS_END_DEV_ATTRS];	20	struct device_attribute private_end_dev_attrs[SAS_END_DEV_ATTRS];
21	struct class_device_attribute private_expander_attrs[SAS_EXPANDER_ATTRS];	21	struct device_attribute private_expander_attrs[SAS_EXPANDER_ATTRS];
22		22
23	struct transport_container phy_attr_cont;	23	struct transport_container phy_attr_cont;
24	struct transport_container port_attr_cont;	24	struct transport_container port_attr_cont;
@@ -30,12 +30,12 @@ struct sas_internal {
30	* The array of null terminated pointers to attributes	30	* The array of null terminated pointers to attributes
31	* needed by scsi_sysfs.c	31	* needed by scsi_sysfs.c
32	*/	32	*/
33	struct class_device_attribute *host_attrs[SAS_HOST_ATTRS + 1];	33	struct device_attribute *host_attrs[SAS_HOST_ATTRS + 1];
34	struct class_device_attribute *phy_attrs[SAS_PHY_ATTRS + 1];	34	struct device_attribute *phy_attrs[SAS_PHY_ATTRS + 1];
35	struct class_device_attribute *port_attrs[SAS_PORT_ATTRS + 1];	35	struct device_attribute *port_attrs[SAS_PORT_ATTRS + 1];
36	struct class_device_attribute *rphy_attrs[SAS_RPORT_ATTRS + 1];	36	struct device_attribute *rphy_attrs[SAS_RPORT_ATTRS + 1];
37	struct class_device_attribute *end_dev_attrs[SAS_END_DEV_ATTRS + 1];	37	struct device_attribute *end_dev_attrs[SAS_END_DEV_ATTRS + 1];
38	struct class_device_attribute *expander_attrs[SAS_EXPANDER_ATTRS + 1];	38	struct device_attribute *expander_attrs[SAS_EXPANDER_ATTRS + 1];
39	};	39	};
40	#define to_sas_internal(tmpl) container_of(tmpl, struct sas_internal, t)	40	#define to_sas_internal(tmpl) container_of(tmpl, struct sas_internal, t)
41		41