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

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: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f2523502

drivers/scsi/be2iscsi/be_main.c

+12 −9
Original line number Diff line number Diff line
@@ -163,17 +163,20 @@ DEVICE_ATTR(beiscsi_active_session_count, S_IRUGO, 
	     beiscsi_active_session_disp, NULL);

DEVICE_ATTR(beiscsi_free_session_count, S_IRUGO,

	     beiscsi_free_session_disp, NULL);

static struct device_attribute *beiscsi_attrs[] = {

	&dev_attr_beiscsi_log_enable,

	&dev_attr_beiscsi_drvr_ver,

	&dev_attr_beiscsi_adapter_family,

	&dev_attr_beiscsi_fw_ver,

	&dev_attr_beiscsi_active_session_count,

	&dev_attr_beiscsi_free_session_count,

	&dev_attr_beiscsi_phys_port,



static struct attribute *beiscsi_attrs[] = {

	&dev_attr_beiscsi_log_enable.attr,

	&dev_attr_beiscsi_drvr_ver.attr,

	&dev_attr_beiscsi_adapter_family.attr,

	&dev_attr_beiscsi_fw_ver.attr,

	&dev_attr_beiscsi_active_session_count.attr,

	&dev_attr_beiscsi_free_session_count.attr,

	&dev_attr_beiscsi_phys_port.attr,

	NULL,

};



ATTRIBUTE_GROUPS(beiscsi);



static char const *cqe_desc[] = {

	"RESERVED_DESC",

	"SOL_CMD_COMPLETE",
@@ -391,7 +394,7 @@ static struct scsi_host_template beiscsi_sht = { 
	.eh_abort_handler = beiscsi_eh_abort,

	.eh_device_reset_handler = beiscsi_eh_device_reset,

	.eh_target_reset_handler = iscsi_eh_session_reset,

	.shost_attrs = beiscsi_attrs,

	.shost_groups = beiscsi_groups,

	.sg_tablesize = BEISCSI_SGLIST_ELEMENTS,

	.can_queue = BE2_IO_DEPTH,

	.this_id = -1,