SCSI: convert struct class_device to struct device

It's big, but there doesn't seem to be a way to split it up smaller...

Signed-off-by: Tony Jones <tonyj@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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 class_device_attribute private_phy_attrs[SAS_PHY_ATTRS];
-        struct class_device_attribute private_port_attrs[SAS_PORT_ATTRS];
-        struct class_device_attribute private_rphy_attrs[SAS_RPORT_ATTRS];
-        struct class_device_attribute private_end_dev_attrs[SAS_END_DEV_ATTRS];
-        struct class_device_attribute private_expander_attrs[SAS_EXPANDER_ATTRS];
+        struct device_attribute private_host_attrs[SAS_HOST_ATTRS];
+        struct device_attribute private_phy_attrs[SAS_PHY_ATTRS];
+        struct device_attribute private_port_attrs[SAS_PORT_ATTRS];
+        struct device_attribute private_rphy_attrs[SAS_RPORT_ATTRS];
+        struct device_attribute private_end_dev_attrs[SAS_END_DEV_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 class_device_attribute *phy_attrs[SAS_PHY_ATTRS + 1];
-        struct class_device_attribute *port_attrs[SAS_PORT_ATTRS + 1];
-        struct class_device_attribute *rphy_attrs[SAS_RPORT_ATTRS + 1];
-        struct class_device_attribute *end_dev_attrs[SAS_END_DEV_ATTRS + 1];
-        struct class_device_attribute *expander_attrs[SAS_EXPANDER_ATTRS + 1];
+        struct device_attribute *host_attrs[SAS_HOST_ATTRS + 1];
+        struct device_attribute *phy_attrs[SAS_PHY_ATTRS + 1];
+        struct device_attribute *port_attrs[SAS_PORT_ATTRS + 1];
+        struct device_attribute *rphy_attrs[SAS_RPORT_ATTRS + 1];
+        struct device_attribute *end_dev_attrs[SAS_END_DEV_ATTRS + 1];
+        struct device_attribute *expander_attrs[SAS_EXPANDER_ATTRS + 1];
 };
 #define to_sas_internal(tmpl)   container_of(tmpl, struct sas_internal, t)