korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 22:11:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

scsi: myrs: Switch to attribute groups

Browse Source 
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: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2021-10-12 16:35:44 -07:00 committed by Martin K. Petersen
parent 582c0360db
commit 087c3ace63
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/scsi/myrs.c
View File

@ -1286,14 +1286,16 @@ static ssize_t consistency_check_store(struct device *dev,
} }
static DEVICE_ATTR_RW(consistency_check); static DEVICE_ATTR_RW(consistency_check);
static struct device_attribute *myrs_sdev_attrs[] = { static struct attribute *myrs_sdev_attrs[] = {
&dev_attr_consistency_check, &dev_attr_consistency_check.attr,
&dev_attr_rebuild, &dev_attr_rebuild.attr,
&dev_attr_raid_state, &dev_attr_raid_state.attr,
&dev_attr_raid_level, &dev_attr_raid_level.attr,
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(myrs_sdev);
static ssize_t serial_show(struct device *dev, static ssize_t serial_show(struct device *dev,
struct device_attribute *attr, char *buf) 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 DEVICE_ATTR_RW(disable_enclosure_messages);
static struct device_attribute *myrs_shost_attrs[] = { static struct attribute *myrs_shost_attrs[] = {
&dev_attr_serial, &dev_attr_serial.attr,
&dev_attr_ctlr_num, &dev_attr_ctlr_num.attr,
&dev_attr_processor, &dev_attr_processor.attr,
&dev_attr_model, &dev_attr_model.attr,
&dev_attr_ctlr_type, &dev_attr_ctlr_type.attr,
&dev_attr_cache_size, &dev_attr_cache_size.attr,
&dev_attr_firmware, &dev_attr_firmware.attr,
&dev_attr_discovery, &dev_attr_discovery.attr,
&dev_attr_flush_cache, &dev_attr_flush_cache.attr,
&dev_attr_disable_enclosure_messages, &dev_attr_disable_enclosure_messages.attr,
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(myrs_shost);
/* /*
* SCSI midlayer interface * SCSI midlayer interface
*/ */
@ -1923,8 +1927,8 @@ static struct scsi_host_template myrs_template = {
.slave_configure = myrs_slave_configure, .slave_configure = myrs_slave_configure,
.slave_destroy = myrs_slave_destroy, .slave_destroy = myrs_slave_destroy,
.cmd_size = sizeof(struct myrs_cmdblk), .cmd_size = sizeof(struct myrs_cmdblk),
.shost_attrs = myrs_shost_attrs, .shost_groups = myrs_shost_groups,
.sdev_attrs = myrs_sdev_attrs, .sdev_groups = myrs_sdev_groups,
.this_id = -1, .this_id = -1,
}; };