[PATCH v2 08/46] scsi: 3w-sas: Switch to attribute groups

Bart Van Assche
2021-10-07T21:19:17Z

drivers/scsi/3w-sas.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index 4fde39da54e4..26623a10a2f5 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -198,11 +198,20 @@ static struct device_attribute twl_host_stats_attr = {
};

/* Host attributes initializer */
-static struct device_attribute *twl_host_attrs[] = {
- &twl_host_stats_attr,
+static struct attribute *twl_host_attrs[] = {
+ &twl_host_stats_attr.attr,
NULL,
};

+static const struct attribute_group twl_host_attr_group = {
+ .attrs = twl_host_attrs,
+};
+
+static const struct attribute_group *twl_host_attr_groups[] = {
+ &twl_host_attr_group,
+ NULL
+};
+
/* This function will look up an AEN severity string */
static char *twl_aen_severity_lookup(unsigned char severity_code)
{
@@ -1544,7 +1553,7 @@ static struct scsi_host_template driver_template = {
.sg_tablesize = TW_LIBERATOR_MAX_SGL_LENGTH,
.max_sectors = TW_MAX_SECTORS,
.cmd_per_lun = TW_MAX_CMDS_PER_LUN,
- .shost_attrs = twl_host_attrs,
+ .shost_groups = twl_host_attr_groups,
.emulated = 1,
.no_write_same = 1,
};