scsi: myrb: 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-32-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/myrb.c b/drivers/scsi/myrb.c
index e8a7bcc..2a4506a 100644 (file)
--- a/drivers/scsi/myrb.c
+++ b/drivers/scsi/myrb.c
@@ -2182,22 +2182,26 @@ static ssize_t flush_cache_store(struct device *dev,
 }
 static DEVICE_ATTR_WO(flush_cache);
 
-static struct device_attribute *myrb_sdev_attrs[] = {
-       &dev_attr_rebuild,
-       &dev_attr_consistency_check,
-       &dev_attr_raid_state,
-       &dev_attr_raid_level,
+static struct attribute *myrb_sdev_attrs[] = {
+       &dev_attr_rebuild.attr,
+       &dev_attr_consistency_check.attr,
+       &dev_attr_raid_state.attr,
+       &dev_attr_raid_level.attr,
        NULL,
 };
 
-static struct device_attribute *myrb_shost_attrs[] = {
-       &dev_attr_ctlr_num,
-       &dev_attr_model,
-       &dev_attr_firmware,
-       &dev_attr_flush_cache,
+ATTRIBUTE_GROUPS(myrb_sdev);
+
+static struct attribute *myrb_shost_attrs[] = {
+       &dev_attr_ctlr_num.attr,
+       &dev_attr_model.attr,
+       &dev_attr_firmware.attr,
+       &dev_attr_flush_cache.attr,
        NULL,
 };
 
+ATTRIBUTE_GROUPS(myrb_shost);
+
 static struct scsi_host_template myrb_template = {
        .module                 = THIS_MODULE,
        .name                   = "DAC960",
@@ -2209,8 +2213,8 @@ static struct scsi_host_template myrb_template = {
        .slave_destroy          = myrb_slave_destroy,
        .bios_param             = myrb_biosparam,
        .cmd_size               = sizeof(struct myrb_cmdblk),
-       .shost_attrs            = myrb_shost_attrs,
-       .sdev_attrs             = myrb_sdev_attrs,
+       .shost_groups           = myrb_shost_groups,
+       .sdev_groups            = myrb_sdev_groups,
        .this_id                = -1,
 };