scsi: megaraid_sas: Switch to attribute groups

struct device supports attribute groups directly but does not support
struct device_attribute directly. Hence switch to attribute groups.

Link: https://lore.kernel.org/r/20211012233558.4066756-29-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index d1e7da28be9a6a02bdc7e66920946461bbff8e7e..aeb95f409826a084d144537e100ad00e04a1633f 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3481,19 +3481,21 @@ static DEVICE_ATTR_RW(enable_sdev_max_qd);
 static DEVICE_ATTR_RO(dump_system_regs);
 static DEVICE_ATTR_RO(raid_map_id);
 
-static struct device_attribute *megaraid_host_attrs[] = {
-       &dev_attr_fw_crash_buffer_size,
-       &dev_attr_fw_crash_buffer,
-       &dev_attr_fw_crash_state,
-       &dev_attr_page_size,
-       &dev_attr_ldio_outstanding,
-       &dev_attr_fw_cmds_outstanding,
-       &dev_attr_enable_sdev_max_qd,
-       &dev_attr_dump_system_regs,
-       &dev_attr_raid_map_id,
+static struct attribute *megaraid_host_attrs[] = {
+       &dev_attr_fw_crash_buffer_size.attr,
+       &dev_attr_fw_crash_buffer.attr,
+       &dev_attr_fw_crash_state.attr,
+       &dev_attr_page_size.attr,
+       &dev_attr_ldio_outstanding.attr,
+       &dev_attr_fw_cmds_outstanding.attr,
+       &dev_attr_enable_sdev_max_qd.attr,
+       &dev_attr_dump_system_regs.attr,
+       &dev_attr_raid_map_id.attr,
        NULL,
 };
 
+ATTRIBUTE_GROUPS(megaraid_host);
+
 /*
  * Scsi host template for megaraid_sas driver
  */
@@ -3510,7 +3512,7 @@ static struct scsi_host_template megasas_template = {
        .eh_abort_handler = megasas_task_abort,
        .eh_host_reset_handler = megasas_reset_bus_host,
        .eh_timed_out = megasas_reset_timer,
-       .shost_attrs = megaraid_host_attrs,
+       .shost_groups = megaraid_host_groups,
        .bios_param = megasas_bios_param,
        .map_queues = megasas_map_queues,
        .mq_poll = megasas_blk_mq_poll,