mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Bart Van Assche 2021-10-12 16:35:58 -07:00 committed by Martin K. Petersen
parent 01e570feba
commit a47c6b713e
5 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/hosts.c
View File

@ -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);

2
drivers/scsi/scsi_priv.h
View File

@ -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;

28
drivers/scsi/scsi_sysfs.c
View File

@ -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);

1
include/scsi/scsi_device.h
View File

@ -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

11
include/scsi/scsi_host.h
View File

@ -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