scsi: arcmsr: Switch to attribute groups

[sfrench/cifs-2.6.git] / drivers / scsi / arcmsr / arcmsr_attr.c

diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 57be9609d50406c635b35273f1dfcb7b656c97c3..baeb5e79569026f1af6612705689219bb4a7052f 100644 (file)
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -58,8 +58,6 @@
 #include <scsi/scsi_transport.h>
 #include "arcmsr.h"
 
-struct device_attribute *arcmsr_host_attrs[];
-
 static ssize_t arcmsr_sysfs_iop_message_read(struct file *filp,
                                             struct kobject *kobj,
                                             struct bin_attribute *bin,
@@ -389,16 +387,25 @@ static DEVICE_ATTR(host_fw_numbers_queue, S_IRUGO, arcmsr_attr_host_fw_numbers_q
 static DEVICE_ATTR(host_fw_sdram_size, S_IRUGO, arcmsr_attr_host_fw_sdram_size, NULL);
 static DEVICE_ATTR(host_fw_hd_channels, S_IRUGO, arcmsr_attr_host_fw_hd_channels, NULL);
 
-struct device_attribute *arcmsr_host_attrs[] = {
-       &dev_attr_host_driver_version,
-       &dev_attr_host_driver_posted_cmd,
-       &dev_attr_host_driver_reset,
-       &dev_attr_host_driver_abort,
-       &dev_attr_host_fw_model,
-       &dev_attr_host_fw_version,
-       &dev_attr_host_fw_request_len,
-       &dev_attr_host_fw_numbers_queue,
-       &dev_attr_host_fw_sdram_size,
-       &dev_attr_host_fw_hd_channels,
+static struct attribute *arcmsr_host_attrs[] = {
+       &dev_attr_host_driver_version.attr,
+       &dev_attr_host_driver_posted_cmd.attr,
+       &dev_attr_host_driver_reset.attr,
+       &dev_attr_host_driver_abort.attr,
+       &dev_attr_host_fw_model.attr,
+       &dev_attr_host_fw_version.attr,
+       &dev_attr_host_fw_request_len.attr,
+       &dev_attr_host_fw_numbers_queue.attr,
+       &dev_attr_host_fw_sdram_size.attr,
+       &dev_attr_host_fw_hd_channels.attr,
        NULL,
 };
+
+static const struct attribute_group arcmsr_host_attr_group = {
+       .attrs = arcmsr_host_attrs,
+};
+
+const struct attribute_group *arcmsr_host_groups[] = {
+       &arcmsr_host_attr_group,
+       NULL
+};