scsi: hpsa: 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-22-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/hpsa.c b/drivers/scsi/hpsa.c
index a115344..cdf3328 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -936,30 +936,34 @@ static DEVICE_ATTR(ctlr_num, S_IRUGO,
 static DEVICE_ATTR(legacy_board, S_IRUGO,
        host_show_legacy_board, NULL);
 
-static struct device_attribute *hpsa_sdev_attrs[] = {
-       &dev_attr_raid_level,
-       &dev_attr_lunid,
-       &dev_attr_unique_id,
-       &dev_attr_hp_ssd_smart_path_enabled,
-       &dev_attr_path_info,
-       &dev_attr_sas_address,
+static struct attribute *hpsa_sdev_attrs[] = {
+       &dev_attr_raid_level.attr,
+       &dev_attr_lunid.attr,
+       &dev_attr_unique_id.attr,
+       &dev_attr_hp_ssd_smart_path_enabled.attr,
+       &dev_attr_path_info.attr,
+       &dev_attr_sas_address.attr,
        NULL,
 };
 
-static struct device_attribute *hpsa_shost_attrs[] = {
-       &dev_attr_rescan,
-       &dev_attr_firmware_revision,
-       &dev_attr_commands_outstanding,
-       &dev_attr_transport_mode,
-       &dev_attr_resettable,
-       &dev_attr_hp_ssd_smart_path_status,
-       &dev_attr_raid_offload_debug,
-       &dev_attr_lockup_detected,
-       &dev_attr_ctlr_num,
-       &dev_attr_legacy_board,
+ATTRIBUTE_GROUPS(hpsa_sdev);
+
+static struct attribute *hpsa_shost_attrs[] = {
+       &dev_attr_rescan.attr,
+       &dev_attr_firmware_revision.attr,
+       &dev_attr_commands_outstanding.attr,
+       &dev_attr_transport_mode.attr,
+       &dev_attr_resettable.attr,
+       &dev_attr_hp_ssd_smart_path_status.attr,
+       &dev_attr_raid_offload_debug.attr,
+       &dev_attr_lockup_detected.attr,
+       &dev_attr_ctlr_num.attr,
+       &dev_attr_legacy_board.attr,
        NULL,
 };
 
+ATTRIBUTE_GROUPS(hpsa_shost);
+
 #define HPSA_NRESERVED_CMDS    (HPSA_CMDS_RESERVED_FOR_DRIVER +\
                                 HPSA_MAX_CONCURRENT_PASSTHRUS)
 
@@ -980,8 +984,8 @@ static struct scsi_host_template hpsa_driver_template = {
 #ifdef CONFIG_COMPAT
        .compat_ioctl           = hpsa_compat_ioctl,
 #endif
-       .sdev_attrs = hpsa_sdev_attrs,
-       .shost_attrs = hpsa_shost_attrs,
+       .sdev_groups = hpsa_sdev_groups,
+       .shost_groups = hpsa_shost_groups,
        .max_sectors = 2048,
        .no_write_same = 1,
 };