Commit 7adbf68f authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

scsi: ibmvfc: 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-25-bvanassche@acm.orgAcked-by: default avatarTyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c7da4e1c
...@@ -3588,18 +3588,20 @@ static struct bin_attribute ibmvfc_trace_attr = { ...@@ -3588,18 +3588,20 @@ static struct bin_attribute ibmvfc_trace_attr = {
}; };
#endif #endif
static struct device_attribute *ibmvfc_attrs[] = { static struct attribute *ibmvfc_host_attrs[] = {
&dev_attr_partition_name, &dev_attr_partition_name.attr,
&dev_attr_device_name, &dev_attr_device_name.attr,
&dev_attr_port_loc_code, &dev_attr_port_loc_code.attr,
&dev_attr_drc_name, &dev_attr_drc_name.attr,
&dev_attr_npiv_version, &dev_attr_npiv_version.attr,
&dev_attr_capabilities, &dev_attr_capabilities.attr,
&dev_attr_log_level, &dev_attr_log_level.attr,
&dev_attr_nr_scsi_channels, &dev_attr_nr_scsi_channels.attr,
NULL NULL
}; };
ATTRIBUTE_GROUPS(ibmvfc_host);
static struct scsi_host_template driver_template = { static struct scsi_host_template driver_template = {
.module = THIS_MODULE, .module = THIS_MODULE,
.name = "IBM POWER Virtual FC Adapter", .name = "IBM POWER Virtual FC Adapter",
...@@ -3620,7 +3622,7 @@ static struct scsi_host_template driver_template = { ...@@ -3620,7 +3622,7 @@ static struct scsi_host_template driver_template = {
.this_id = -1, .this_id = -1,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
.max_sectors = IBMVFC_MAX_SECTORS, .max_sectors = IBMVFC_MAX_SECTORS,
.shost_attrs = ibmvfc_attrs, .shost_groups = ibmvfc_host_groups,
.track_queue_depth = 1, .track_queue_depth = 1,
.host_tagset = 1, .host_tagset = 1,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment