scsi: RDMA/srp: 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-5-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/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index f8765f96ec1e5795d4fee32a44f660317e7b6f5e..e174e853f8a40cb9fa10ae71632dac50d663ae18 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1026,10 +1026,17 @@ out:
  */
 static void srp_del_scsi_host_attr(struct Scsi_Host *shost)
 {
-       struct device_attribute **attr;
+       const struct attribute_group **g;
+       struct attribute **attr;
 
-       for (attr = shost->hostt->shost_attrs; attr && *attr; ++attr)
-               device_remove_file(&shost->shost_dev, *attr);
+       for (g = shost->hostt->shost_groups; *g; ++g) {
+               for (attr = (*g)->attrs; *attr; ++attr) {
+                       struct device_attribute *dev_attr =
+                               container_of(*attr, typeof(*dev_attr), attr);
+
+                       device_remove_file(&shost->shost_dev, dev_attr);
+               }
+       }
 }
 
 static void srp_remove_target(struct srp_target_port *target)
@@ -3050,26 +3057,28 @@ static ssize_t allow_ext_sg_show(struct device *dev,
 
 static DEVICE_ATTR_RO(allow_ext_sg);
 
-static struct device_attribute *srp_host_attrs[] = {
-       &dev_attr_id_ext,
-       &dev_attr_ioc_guid,
-       &dev_attr_service_id,
-       &dev_attr_pkey,
-       &dev_attr_sgid,
-       &dev_attr_dgid,
-       &dev_attr_orig_dgid,
-       &dev_attr_req_lim,
-       &dev_attr_zero_req_lim,
-       &dev_attr_local_ib_port,
-       &dev_attr_local_ib_device,
-       &dev_attr_ch_count,
-       &dev_attr_comp_vector,
-       &dev_attr_tl_retry_count,
-       &dev_attr_cmd_sg_entries,
-       &dev_attr_allow_ext_sg,
+static struct attribute *srp_host_attrs[] = {
+       &dev_attr_id_ext.attr,
+       &dev_attr_ioc_guid.attr,
+       &dev_attr_service_id.attr,
+       &dev_attr_pkey.attr,
+       &dev_attr_sgid.attr,
+       &dev_attr_dgid.attr,
+       &dev_attr_orig_dgid.attr,
+       &dev_attr_req_lim.attr,
+       &dev_attr_zero_req_lim.attr,
+       &dev_attr_local_ib_port.attr,
+       &dev_attr_local_ib_device.attr,
+       &dev_attr_ch_count.attr,
+       &dev_attr_comp_vector.attr,
+       &dev_attr_tl_retry_count.attr,
+       &dev_attr_cmd_sg_entries.attr,
+       &dev_attr_allow_ext_sg.attr,
        NULL
 };
 
+ATTRIBUTE_GROUPS(srp_host);
+
 static struct scsi_host_template srp_template = {
        .module                         = THIS_MODULE,
        .name                           = "InfiniBand SRP initiator",
@@ -3090,7 +3099,7 @@ static struct scsi_host_template srp_template = {
        .can_queue                      = SRP_DEFAULT_CMD_SQ_SIZE,
        .this_id                        = -1,
        .cmd_per_lun                    = SRP_DEFAULT_CMD_SQ_SIZE,
-       .shost_attrs                    = srp_host_attrs,
+       .shost_groups                   = srp_host_groups,
        .track_queue_depth              = 1,
        .cmd_size                       = sizeof(struct srp_request),
 };