Commit 087c3ace authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: myrs: 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-33-bvanassche@acm.org


Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 582c0360

drivers/scsi/myrs.c

+22 −18
Original line number Diff line number Diff line
@@ -1286,14 +1286,16 @@ static ssize_t consistency_check_store(struct device *dev, 
}

static DEVICE_ATTR_RW(consistency_check);



static struct device_attribute *myrs_sdev_attrs[] = {

	&dev_attr_consistency_check,

	&dev_attr_rebuild,

	&dev_attr_raid_state,

	&dev_attr_raid_level,

static struct attribute *myrs_sdev_attrs[] = {

	&dev_attr_consistency_check.attr,

	&dev_attr_rebuild.attr,

	&dev_attr_raid_state.attr,

	&dev_attr_raid_level.attr,

	NULL,

};



ATTRIBUTE_GROUPS(myrs_sdev);



static ssize_t serial_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{
@@ -1510,20 +1512,22 @@ static ssize_t disable_enclosure_messages_store(struct device *dev, 
}

static DEVICE_ATTR_RW(disable_enclosure_messages);



static struct device_attribute *myrs_shost_attrs[] = {

	&dev_attr_serial,

	&dev_attr_ctlr_num,

	&dev_attr_processor,

	&dev_attr_model,

	&dev_attr_ctlr_type,

	&dev_attr_cache_size,

	&dev_attr_firmware,

	&dev_attr_discovery,

	&dev_attr_flush_cache,

	&dev_attr_disable_enclosure_messages,

static struct attribute *myrs_shost_attrs[] = {

	&dev_attr_serial.attr,

	&dev_attr_ctlr_num.attr,

	&dev_attr_processor.attr,

	&dev_attr_model.attr,

	&dev_attr_ctlr_type.attr,

	&dev_attr_cache_size.attr,

	&dev_attr_firmware.attr,

	&dev_attr_discovery.attr,

	&dev_attr_flush_cache.attr,

	&dev_attr_disable_enclosure_messages.attr,

	NULL,

};



ATTRIBUTE_GROUPS(myrs_shost);



/*

 * SCSI midlayer interface

 */
@@ -1923,8 +1927,8 @@ static struct scsi_host_template myrs_template = { 
	.slave_configure	= myrs_slave_configure,

	.slave_destroy		= myrs_slave_destroy,

	.cmd_size		= sizeof(struct myrs_cmdblk),

	.shost_attrs		= myrs_shost_attrs,

	.sdev_attrs		= myrs_sdev_attrs,

	.shost_groups		= myrs_shost_groups,

	.sdev_groups		= myrs_sdev_groups,

	.this_id		= -1,

};