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

scsi: qedf: 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-38-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 646bed7e

drivers/scsi/qedf/qedf.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -498,7 +498,7 @@ extern void qedf_process_abts_compl(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, 
extern struct qedf_ioreq *qedf_alloc_cmd(struct qedf_rport *fcport,

extern struct qedf_ioreq *qedf_alloc_cmd(struct qedf_rport *fcport,

	u8 cmd_type);

	u8 cmd_type);





extern struct device_attribute *qedf_host_attrs[];

extern const struct attribute_group *qedf_host_groups[];

extern void qedf_cmd_timer_set(struct qedf_ctx *qedf, struct qedf_ioreq *io_req,

extern void qedf_cmd_timer_set(struct qedf_ctx *qedf, struct qedf_ioreq *io_req,

	unsigned int timer_msec);

	unsigned int timer_msec);

extern int qedf_init_mp_req(struct qedf_ioreq *io_req);

extern int qedf_init_mp_req(struct qedf_ioreq *io_req);

drivers/scsi/qedf/qedf_attr.c

+12 −3
Original line number Original line Diff line number Diff line
@@ -60,12 +60,21 @@ static ssize_t fka_period_show(struct device *dev, 
static DEVICE_ATTR_RO(fcoe_mac);

static DEVICE_ATTR_RO(fcoe_mac);

static DEVICE_ATTR_RO(fka_period);

static DEVICE_ATTR_RO(fka_period);





struct device_attribute *qedf_host_attrs[] = {

static struct attribute *qedf_host_attrs[] = {

	&dev_attr_fcoe_mac,

	&dev_attr_fcoe_mac.attr,

	&dev_attr_fka_period,

	&dev_attr_fka_period.attr,

	NULL,

	NULL,

};

};





static const struct attribute_group qedf_host_attr_group = {

	.attrs = qedf_host_attrs

};



const struct attribute_group *qedf_host_groups[] = {

	&qedf_host_attr_group,

	NULL

};



extern const struct qed_fcoe_ops *qed_ops;

extern const struct qed_fcoe_ops *qed_ops;





void qedf_capture_grc_dump(struct qedf_ctx *qedf)

void qedf_capture_grc_dump(struct qedf_ctx *qedf)

drivers/scsi/qedf/qedf_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -986,7 +986,7 @@ static struct scsi_host_template qedf_host_template = { 
	.cmd_per_lun	= 32,

	.cmd_per_lun	= 32,

	.max_sectors 	= 0xffff,

	.max_sectors 	= 0xffff,

	.queuecommand 	= qedf_queuecommand,

	.queuecommand 	= qedf_queuecommand,

	.shost_attrs	= qedf_host_attrs,

	.shost_groups	= qedf_host_groups,

	.eh_abort_handler	= qedf_eh_abort,

	.eh_abort_handler	= qedf_eh_abort,

	.eh_device_reset_handler = qedf_eh_device_reset, /* lun reset */

	.eh_device_reset_handler = qedf_eh_device_reset, /* lun reset */

	.eh_target_reset_handler = qedf_eh_target_reset, /* target reset */

	.eh_target_reset_handler = qedf_eh_target_reset, /* target reset */