scsi: usb: 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-46-bvanassche@acm.org
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 220aa1cf4b3d4dd891826827a00554facbe30d42..8931df5a85fd9e49de0e8b8f399771405168ed06 100644 (file)
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -587,11 +587,13 @@ static ssize_t max_sectors_store(struct device *dev, struct device_attribute *at
 }
 static DEVICE_ATTR_RW(max_sectors);
 
-static struct device_attribute *sysfs_device_attr_list[] = {
-       &dev_attr_max_sectors,
+static struct attribute *usb_sdev_attrs[] = {
+       &dev_attr_max_sectors.attr,
        NULL,
 };
 
+ATTRIBUTE_GROUPS(usb_sdev);
+
 /*
  * this defines our host template, with which we'll allocate hosts
  */
@@ -652,7 +654,7 @@ static const struct scsi_host_template usb_stor_host_template = {
        .skip_settle_delay =            1,
 
        /* sysfs device attributes */
-       .sdev_attrs =                   sysfs_device_attr_list,
+       .sdev_groups =                  usb_sdev_groups,
 
        /* module management */
        .module =                       THIS_MODULE