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

scsi: snic: 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-44-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 64fc9015

drivers/scsi/snic/snic.h

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ int snic_glob_init(void); 
void snic_glob_cleanup(void);



extern struct workqueue_struct *snic_event_queue;

extern struct device_attribute *snic_attrs[];

extern const struct attribute_group *snic_host_groups[];



int snic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);

int snic_abort_cmd(struct scsi_cmnd *);

drivers/scsi/snic/snic_attrs.c

+14 −5
Original line number Diff line number Diff line
@@ -68,10 +68,19 @@ static DEVICE_ATTR(snic_state, S_IRUGO, snic_show_state, NULL); 
static DEVICE_ATTR(drv_version, S_IRUGO, snic_show_drv_version, NULL);

static DEVICE_ATTR(link_state, S_IRUGO, snic_show_link_state, NULL);



struct device_attribute *snic_attrs[] = {

	&dev_attr_snic_sym_name,

	&dev_attr_snic_state,

	&dev_attr_drv_version,

	&dev_attr_link_state,

static struct attribute *snic_host_attrs[] = {

	&dev_attr_snic_sym_name.attr,

	&dev_attr_snic_state.attr,

	&dev_attr_drv_version.attr,

	&dev_attr_link_state.attr,

	NULL,

};



static const struct attribute_group snic_host_attr_group = {

	.attrs = snic_host_attrs

};



const struct attribute_group *snic_host_groups[] = {

	&snic_host_attr_group,

	NULL

};

drivers/scsi/snic/snic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct scsi_host_template snic_host_template = { 
	.can_queue = SNIC_MAX_IO_REQ,

	.sg_tablesize = SNIC_MAX_SG_DESC_CNT,

	.max_sectors = 0x800,

	.shost_attrs = snic_attrs,

	.shost_groups = snic_host_groups,

	.track_queue_depth = 1,

	.cmd_size = sizeof(struct snic_internal_io_state),

	.proc_name = "snic_scsi",