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: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qedf/qedf.h b/drivers/scsi/qedf/qedf.h
index ba94413fe2ead1f1940e49dd8c4d9934eb2bbc89..4caddd6442f749c68d22c97d870fcfb58e803918 100644 (file)
--- a/drivers/scsi/qedf/qedf.h
+++ b/drivers/scsi/qedf/qedf.h
@@ -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,
        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,
        unsigned int timer_msec);
 extern int qedf_init_mp_req(struct qedf_ioreq *io_req);

diff --git a/drivers/scsi/qedf/qedf_attr.c b/drivers/scsi/qedf/qedf_attr.c
index 461c0c9180c444e92a3494da7bc1c0bb8d282627..fdc66d2948130858dc990e9fd001b28c5d5a0983 100644 (file)
--- a/drivers/scsi/qedf/qedf_attr.c
+++ b/drivers/scsi/qedf/qedf_attr.c
@@ -60,12 +60,21 @@ static ssize_t fka_period_show(struct device *dev,
 static DEVICE_ATTR_RO(fcoe_mac);
 static DEVICE_ATTR_RO(fka_period);
 
-struct device_attribute *qedf_host_attrs[] = {
-       &dev_attr_fcoe_mac,
-       &dev_attr_fka_period,
+static struct attribute *qedf_host_attrs[] = {
+       &dev_attr_fcoe_mac.attr,
+       &dev_attr_fka_period.attr,
        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;
 
 void qedf_capture_grc_dump(struct qedf_ctx *qedf)

diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 42d0d941dba5c30bba493cd2f57df05da8aced1f..1eed6270e8f206055f5b72452fed9103accc9985 100644 (file)
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -986,7 +986,7 @@ static struct scsi_host_template qedf_host_template = {
        .cmd_per_lun    = 32,
        .max_sectors    = 0xffff,
        .queuecommand   = qedf_queuecommand,
-       .shost_attrs    = qedf_host_attrs,
+       .shost_groups   = qedf_host_groups,
        .eh_abort_handler       = qedf_eh_abort,
        .eh_device_reset_handler = qedf_eh_device_reset, /* lun reset */
        .eh_target_reset_handler = qedf_eh_target_reset, /* target reset */