[PATCH v2 46/46] scsi: core: Remove two host template members that are no longer used

Bart Van Assche
2021-10-07T21:20:54Z

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.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/hosts.c | 9 ---------
drivers/scsi/scsi_priv.h | 2 --
drivers/scsi/scsi_sysfs.c | 28 ----------------------------
include/scsi/scsi_device.h | 1 -
include/scsi/scsi_host.h | 11 -----------
5 files changed, 51 deletions(-)

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 3443f009a9e8..b3b7b55a90c6 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -482,15 +482,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 a5a2f18cc734..b7a82c426058 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -137,8 +137,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 05b4d69d53d4..2e69fad0dc51 100644
--- 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,
@@ -1603,14 +1583,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 01732aabd7c3..b1e9b3bd3a60 100644
--- 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 ab8775811e6f..c2b4d6677a76 100644
--- 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