2 files changed, 69 insertions, 55 deletions

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 89c63147a15d..b109bd8a4d19 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -3300,9 +3300,10 @@ mptscsih_synchronize_cache(MPT_SCSI_HOST *hd, VirtDevice *vdevice)
 }
 
 static ssize_t
-mptscsih_version_fw_show(struct class_device *cdev, char *buf)
+mptscsih_version_fw_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
@@ -3312,12 +3313,13 @@ mptscsih_version_fw_show(struct class_device *cdev, char *buf)
             (ioc->facts.FWVersion.Word & 0x0000FF00) >> 8,
             ioc->facts.FWVersion.Word & 0x000000FF);
 }
-static CLASS_DEVICE_ATTR(version_fw, S_IRUGO, mptscsih_version_fw_show, NULL);
+static DEVICE_ATTR(version_fw, S_IRUGO, mptscsih_version_fw_show, NULL);
 
 static ssize_t
-mptscsih_version_bios_show(struct class_device *cdev, char *buf)
+mptscsih_version_bios_show(struct device *dev, struct device_attribute *attr,
+                           char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
@@ -3327,129 +3329,141 @@ mptscsih_version_bios_show(struct class_device *cdev, char *buf)
             (ioc->biosVersion & 0x0000FF00) >> 8,
             ioc->biosVersion & 0x000000FF);
 }
-static CLASS_DEVICE_ATTR(version_bios, S_IRUGO, mptscsih_version_bios_show, NULL);
+static DEVICE_ATTR(version_bios, S_IRUGO, mptscsih_version_bios_show, NULL);
 
 static ssize_t
-mptscsih_version_mpi_show(struct class_device *cdev, char *buf)
+mptscsih_version_mpi_show(struct device *dev, struct device_attribute *attr,
+                          char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%03x\n", ioc->facts.MsgVersion);
 }
-static CLASS_DEVICE_ATTR(version_mpi, S_IRUGO, mptscsih_version_mpi_show, NULL);
+static DEVICE_ATTR(version_mpi, S_IRUGO, mptscsih_version_mpi_show, NULL);
 
 static ssize_t
-mptscsih_version_product_show(struct class_device *cdev, char *buf)
+mptscsih_version_product_show(struct device *dev,
+                              struct device_attribute *attr,
+char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%s\n", ioc->prod_name);
 }
-static CLASS_DEVICE_ATTR(version_product, S_IRUGO,
+static DEVICE_ATTR(version_product, S_IRUGO,
     mptscsih_version_product_show, NULL);
 
 static ssize_t
-mptscsih_version_nvdata_persistent_show(struct class_device *cdev, char *buf)
+mptscsih_version_nvdata_persistent_show(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%02xh\n",
             ioc->nvdata_version_persistent);
 }
-static CLASS_DEVICE_ATTR(version_nvdata_persistent, S_IRUGO,
+static DEVICE_ATTR(version_nvdata_persistent, S_IRUGO,
     mptscsih_version_nvdata_persistent_show, NULL);
 
 static ssize_t
-mptscsih_version_nvdata_default_show(struct class_device *cdev, char *buf)
+mptscsih_version_nvdata_default_show(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%02xh\n",ioc->nvdata_version_default);
 }
-static CLASS_DEVICE_ATTR(version_nvdata_default, S_IRUGO,
+static DEVICE_ATTR(version_nvdata_default, S_IRUGO,
     mptscsih_version_nvdata_default_show, NULL);
 
 static ssize_t
-mptscsih_board_name_show(struct class_device *cdev, char *buf)
+mptscsih_board_name_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%s\n", ioc->board_name);
 }
-static CLASS_DEVICE_ATTR(board_name, S_IRUGO, mptscsih_board_name_show, NULL);
+static DEVICE_ATTR(board_name, S_IRUGO, mptscsih_board_name_show, NULL);
 
 static ssize_t
-mptscsih_board_assembly_show(struct class_device *cdev, char *buf)
+mptscsih_board_assembly_show(struct device *dev,
+                             struct device_attribute *attr, char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%s\n", ioc->board_assembly);
 }
-static CLASS_DEVICE_ATTR(board_assembly, S_IRUGO,
+static DEVICE_ATTR(board_assembly, S_IRUGO,
     mptscsih_board_assembly_show, NULL);
 
 static ssize_t
-mptscsih_board_tracer_show(struct class_device *cdev, char *buf)
+mptscsih_board_tracer_show(struct device *dev, struct device_attribute *attr,
+                           char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%s\n", ioc->board_tracer);
 }
-static CLASS_DEVICE_ATTR(board_tracer, S_IRUGO,
+static DEVICE_ATTR(board_tracer, S_IRUGO,
     mptscsih_board_tracer_show, NULL);
 
 static ssize_t
-mptscsih_io_delay_show(struct class_device *cdev, char *buf)
+mptscsih_io_delay_show(struct device *dev, struct device_attribute *attr,
+                       char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%02d\n", ioc->io_missing_delay);
 }
-static CLASS_DEVICE_ATTR(io_delay, S_IRUGO,
+static DEVICE_ATTR(io_delay, S_IRUGO,
     mptscsih_io_delay_show, NULL);
 
 static ssize_t
-mptscsih_device_delay_show(struct class_device *cdev, char *buf)
+mptscsih_device_delay_show(struct device *dev, struct device_attribute *attr,
+                           char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%02d\n", ioc->device_missing_delay);
 }
-static CLASS_DEVICE_ATTR(device_delay, S_IRUGO,
+static DEVICE_ATTR(device_delay, S_IRUGO,
     mptscsih_device_delay_show, NULL);
 
 static ssize_t
-mptscsih_debug_level_show(struct class_device *cdev, char *buf)
+mptscsih_debug_level_show(struct device *dev, struct device_attribute *attr,
+                          char *buf)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
 
         return snprintf(buf, PAGE_SIZE, "%08xh\n", ioc->debug_level);
 }
 static ssize_t
-mptscsih_debug_level_store(struct class_device *cdev, const char *buf,
-                                                                size_t count)
+mptscsih_debug_level_store(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
-        struct Scsi_Host *host = class_to_shost(cdev);
+        struct Scsi_Host *host = class_to_shost(dev);
         MPT_SCSI_HOST   *hd = shost_priv(host);
         MPT_ADAPTER *ioc = hd->ioc;
         int val = 0;
@@ -3462,22 +3476,22 @@ mptscsih_debug_level_store(struct class_device *cdev, const char *buf,
                                 ioc->name, ioc->debug_level);
         return strlen(buf);
 }
-static CLASS_DEVICE_ATTR(debug_level, S_IRUGO | S_IWUSR,
-    mptscsih_debug_level_show, mptscsih_debug_level_store);
-
-struct class_device_attribute *mptscsih_host_attrs[] = {
-        &class_device_attr_version_fw,
-        &class_device_attr_version_bios,
-        &class_device_attr_version_mpi,
-        &class_device_attr_version_product,
-        &class_device_attr_version_nvdata_persistent,
-        &class_device_attr_version_nvdata_default,
-        &class_device_attr_board_name,
-        &class_device_attr_board_assembly,
-        &class_device_attr_board_tracer,
-        &class_device_attr_io_delay,
-        &class_device_attr_device_delay,
-        &class_device_attr_debug_level,
+static DEVICE_ATTR(debug_level, S_IRUGO | S_IWUSR,
+        mptscsih_debug_level_show, mptscsih_debug_level_store);
+
+struct device_attribute *mptscsih_host_attrs[] = {
+        &dev_attr_version_fw,
+        &dev_attr_version_bios,
+        &dev_attr_version_mpi,
+        &dev_attr_version_product,
+        &dev_attr_version_nvdata_persistent,
+        &dev_attr_version_nvdata_default,
+        &dev_attr_board_name,
+        &dev_attr_board_assembly,
+        &dev_attr_board_tracer,
+        &dev_attr_io_delay,
+        &dev_attr_device_delay,
+        &dev_attr_debug_level,
         NULL,
 };
 EXPORT_SYMBOL(mptscsih_host_attrs);
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index d289e97cfe8b..7ea7da0e090c 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -129,4 +129,4 @@ extern void mptscsih_timer_expired(unsigned long data);
 extern int mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int ctx2abort, ulong timeout);
 extern u8 mptscsih_raid_id_to_num(MPT_ADAPTER *ioc, u8 channel, u8 id);
 extern int mptscsih_is_phys_disk(MPT_ADAPTER *ioc, u8 channel, u8 id);
-extern struct class_device_attribute *mptscsih_host_attrs[];
+extern struct device_attribute *mptscsih_host_attrs[];