[PATCH v2 45/46] scsi: usb: Switch to attribute groups

[Bart Van Assche <bvanassche@acm.org>]

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

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/usb/storage/scsiglue.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index e5a971b83e3f..123273c52fc8 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -588,11 +588,20 @@ 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,
 };
 
+static const struct attribute_group usb_sdev_attr_group = {
+	.attrs = usb_sdev_attrs
+};
+
+static const struct attribute_group *usb_sdev_attr_groups[] = {
+	&usb_sdev_attr_group,
+	NULL
+};
+
 /*
  * this defines our host template, with which we'll allocate hosts
  */
@@ -653,7 +662,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_attr_groups,
 
 	/* module management */
 	.module =			THIS_MODULE