scsi: core: Remove two host template members that are no longer used

All SCSI drivers have been converted to use shost_groups and sdev_groups
instead of shost_attrs or sdev_attrs. Hence remove shost_attrs and
sdev_attrs. Additionally, remove the 'lld_attr_group' members and also
the scsi_convert_dev_attrs() function.

Link: https://lore.kernel.org/r/20211012233558.4066756-47-bvanassche@acm.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 09157792d36bcd5bcebaa7f3ca15d428838f20bc..17aef936bc9063f09fb69b530727cf2e02ff70b5 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -483,15 +483,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
        dev_set_name(&shost->shost_dev, "host%d", shost->host_no);
        shost->shost_dev.groups = shost->shost_dev_attr_groups;
        shost->shost_dev_attr_groups[j++] = &scsi_shost_attr_group;
-       if (sht->shost_attrs) {
-               shost->lld_attr_group = (struct attribute_group){
-                       .attrs = scsi_convert_dev_attrs(&shost->shost_gendev,
-                                                       sht->shost_attrs)
-               };
-               if (shost->lld_attr_group.attrs)
-                       shost->shost_dev_attr_groups[j++] =
-                               &shost->lld_attr_group;
-       }
        if (sht->shost_groups) {
                for (i = 0; sht->shost_groups[i] &&
                             j < ARRAY_SIZE(shost->shost_dev_attr_groups);

diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 483d0ad5fe60214d8b0a2b99cc79f9ce5afc6cca..a278fc8948f42c15a50184d631fc0acc14669c16 100644 (file)
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -138,8 +138,6 @@ extern int scsi_sysfs_add_sdev(struct scsi_device *);
 extern int scsi_sysfs_add_host(struct Scsi_Host *);
 extern int scsi_sysfs_register(void);
 extern void scsi_sysfs_unregister(void);
-struct attribute **scsi_convert_dev_attrs(struct device *dev,
-                                         struct device_attribute **dev_attr);
 extern void scsi_sysfs_device_initialize(struct scsi_device *);
 extern int scsi_sysfs_target_initialize(struct scsi_device *);
 extern struct scsi_transport_template blank_transport_template;

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 3d98db6a97e60b7261ded9b31c10fb2d5b0bf09a..c26f0e29e8cd2b89fb3f770fc3872c794cc6b2cc 100644 (file)
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1563,26 +1563,6 @@ int scsi_sysfs_add_host(struct Scsi_Host *shost)
        return 0;
 }
 
-/*
- * Convert an array of struct device_attribute pointers into an array of
- * struct attribute pointers.
- */
-struct attribute **scsi_convert_dev_attrs(struct device *dev,
-                                         struct device_attribute **dev_attr)
-{
-       struct attribute **attrs;
-       int i;
-
-       for (i = 0; dev_attr[i]; i++)
-               ;
-       attrs = devm_kzalloc(dev, (i + 1) * sizeof(*attrs), GFP_KERNEL);
-       if (!attrs)
-               return NULL;
-       for (i = 0; dev_attr[i]; i++)
-               attrs[i] = &dev_attr[i]->attr;
-       return attrs;
-}
-
 static struct device_type scsi_dev_type = {
        .name =         "scsi_device",
        .release =      scsi_device_dev_release,
@@ -1604,14 +1584,6 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)
        dev_set_name(&sdev->sdev_gendev, "%d:%d:%d:%llu",
                     sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
        sdev->gendev_attr_groups[j++] = &scsi_sdev_attr_group;
-       if (hostt->sdev_attrs) {
-               sdev->lld_attr_group = (struct attribute_group){
-                       .attrs = scsi_convert_dev_attrs(&sdev->sdev_gendev,
-                                                       hostt->sdev_attrs)
-               };
-               if (sdev->lld_attr_group.attrs)
-                       sdev->gendev_attr_groups[j++] = &sdev->lld_attr_group;
-       }
        if (hostt->sdev_groups) {
                for (i = 0; hostt->sdev_groups[i] &&
                             j < ARRAY_SIZE(sdev->gendev_attr_groups);

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 01732aabd7c32be434b3533770cde0a2c27c7d65..b1e9b3bd3a602f8e89eed4c3487a9b9b529c5213 100644 (file)
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -225,7 +225,6 @@ struct scsi_device {
 
        struct device           sdev_gendev,
                                sdev_dev;
-       struct attribute_group  lld_attr_group;
        /*
         * The array size 6 provides space for one attribute group for the
         * SCSI core, four attribute groups defined by SCSI LLDs and one

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index bc2fcb72ff593c074e8552e161931c14c283e64c..ae715959f886abf722bd8602c35c083ec2e09740 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -473,16 +473,6 @@ struct scsi_host_template {
         */
 #define SCSI_DEFAULT_HOST_BLOCKED      7
 
-       /*
-        * Pointer to the sysfs class properties for this host, NULL terminated.
-        */
-       struct device_attribute **shost_attrs;
-
-       /*
-        * Pointer to the SCSI device properties for this host, NULL terminated.
-        */
-       struct device_attribute **sdev_attrs;
-
        /*
         * Pointer to the SCSI host sysfs attribute groups, NULL terminated.
         */
@@ -700,7 +690,6 @@ struct Scsi_Host {
 
        /* ldm bits */
        struct device           shost_gendev, shost_dev;
-       struct attribute_group  lld_attr_group;
        /*
         * The array size 3 provides space for one attribute group defined by
         * the SCSI core, one attribute group defined by the SCSI LLD and one