scsi: pmcraid: 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-37-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/pmcraid.c b/drivers/scsi/pmcraid.c
index 18efb3e64c84e445a3b0e3e3d53f2445c96a57b3..88046a7937673706e66c6985045a85f57badbd1c 100644 (file)
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4093,13 +4093,14 @@ static struct device_attribute pmcraid_adapter_id_attr = {
        .show = pmcraid_show_adapter_id,
 };
 
-static struct device_attribute *pmcraid_host_attrs[] = {
-       &pmcraid_log_level_attr,
-       &pmcraid_driver_version_attr,
-       &pmcraid_adapter_id_attr,
+static struct attribute *pmcraid_host_attrs[] = {
+       &pmcraid_log_level_attr.attr,
+       &pmcraid_driver_version_attr.attr,
+       &pmcraid_adapter_id_attr.attr,
        NULL,
 };
 
+ATTRIBUTE_GROUPS(pmcraid_host);
 
 /* host template structure for pmcraid driver */
 static struct scsi_host_template pmcraid_host_template = {
@@ -4122,7 +4123,7 @@ static struct scsi_host_template pmcraid_host_template = {
        .max_sectors = PMCRAID_IOA_MAX_SECTORS,
        .no_write_same = 1,
        .cmd_per_lun = PMCRAID_MAX_CMD_PER_LUN,
-       .shost_attrs = pmcraid_host_attrs,
+       .shost_groups = pmcraid_host_groups,
        .proc_name = PMCRAID_DRIVER_NAME,
 };