summaryrefslogtreecommitdiff
path: root/include/scsi
diff options
context:
space:
mode:
authorBart Van Assche <bvanassche@acm.org>2021-10-12 16:35:58 -0700
committerMartin K. Petersen <martin.petersen@oracle.com>2021-10-16 21:45:59 -0400
commita47c6b713e89eef9e26ef9b17944fc807510bf3c (patch)
tree84af764a0fa0ffeda8785b948858645fe034030e /include/scsi
parent01e570febaaafd74d6625476e2665238c5e47e1e (diff)
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>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_device.h1
-rw-r--r--include/scsi/scsi_host.h11
2 files changed, 0 insertions, 12 deletions
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 bc2fcb72ff59..ae715959f886 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -474,16 +474,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.
*/
const struct attribute_group **shost_groups;
@@ -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