tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
scsi: be2iscsi: 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-14-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
authored by
Bart Van Assche
and committed by
Martin K. Petersen
ebcbac34
f2523502
+12
-9
+12
-9
drivers/scsi/be2iscsi/be_main.c
+12
-9
drivers/scsi/be2iscsi/be_main.c
···
163
163
beiscsi_active_session_disp, NULL);
164
164
DEVICE_ATTR(beiscsi_free_session_count, S_IRUGO,
165
165
beiscsi_free_session_disp, NULL);
166
-
static struct device_attribute *beiscsi_attrs[] = {
167
-
&dev_attr_beiscsi_log_enable,
168
-
&dev_attr_beiscsi_drvr_ver,
169
-
&dev_attr_beiscsi_adapter_family,
170
-
&dev_attr_beiscsi_fw_ver,
171
-
&dev_attr_beiscsi_active_session_count,
172
-
&dev_attr_beiscsi_free_session_count,
173
-
&dev_attr_beiscsi_phys_port,
166
+
167
+
static struct attribute *beiscsi_attrs[] = {
168
+
&dev_attr_beiscsi_log_enable.attr,
169
+
&dev_attr_beiscsi_drvr_ver.attr,
170
+
&dev_attr_beiscsi_adapter_family.attr,
171
+
&dev_attr_beiscsi_fw_ver.attr,
172
+
&dev_attr_beiscsi_active_session_count.attr,
173
+
&dev_attr_beiscsi_free_session_count.attr,
174
+
&dev_attr_beiscsi_phys_port.attr,
174
175
NULL,
175
176
};
177
+
178
+
ATTRIBUTE_GROUPS(beiscsi);
176
179
177
180
static char const *cqe_desc[] = {
178
181
"RESERVED_DESC",
···
394
391
.eh_abort_handler = beiscsi_eh_abort,
395
392
.eh_device_reset_handler = beiscsi_eh_device_reset,
396
393
.eh_target_reset_handler = iscsi_eh_session_reset,
397
-
.shost_attrs = beiscsi_attrs,
394
+
.shost_groups = beiscsi_groups,
398
395
.sg_tablesize = BEISCSI_SGLIST_ELEMENTS,
399
396
.can_queue = BE2_IO_DEPTH,
400
397
.this_id = -1,