From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>,
Damien Le Moal <damien.lemoal@opensource.wdc.com>
Subject: [PATCH v2 02/46] ata: Switch to attribute groups
Date: Thu, 7 Oct 2021 14:18:08 -0700 [thread overview]
Message-ID: <20211007211852.256007-3-bvanassche@acm.org> (raw)
In-Reply-To: <20211007211852.256007-1-bvanassche@acm.org>
struct device supports attribute groups directly but does not support
struct device_attribute directly. Hence switch to attribute groups.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/ata/ahci.h | 8 +++---
drivers/ata/ata_piix.c | 15 ++++++++---
drivers/ata/libahci.c | 52 ++++++++++++++++++++++++++-------------
drivers/ata/libata-sata.c | 19 ++++++++++----
drivers/ata/libata-scsi.c | 15 ++++++++---
drivers/ata/pata_macio.c | 2 +-
drivers/ata/sata_mv.c | 2 +-
drivers/ata/sata_nv.c | 4 +--
drivers/ata/sata_sil24.c | 2 +-
include/linux/libata.h | 8 +++---
10 files changed, 86 insertions(+), 41 deletions(-)
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 2e89499bd9c3..ef77b6551382 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -376,8 +376,8 @@ struct ahci_host_priv {
extern int ahci_ignore_sss;
-extern struct device_attribute *ahci_shost_attrs[];
-extern struct device_attribute *ahci_sdev_attrs[];
+extern const struct attribute_group *ahci_shost_attr_groups[];
+extern const struct attribute_group *ahci_sdev_attr_groups[];
/*
* This must be instantiated by the edge drivers. Read the comments
@@ -388,8 +388,8 @@ extern struct device_attribute *ahci_sdev_attrs[];
.can_queue = AHCI_MAX_CMDS, \
.sg_tablesize = AHCI_MAX_SG, \
.dma_boundary = AHCI_DMA_BOUNDARY, \
- .shost_attrs = ahci_shost_attrs, \
- .sdev_attrs = ahci_sdev_attrs, \
+ .shost_groups = ahci_shost_attr_groups, \
+ .sdev_groups = ahci_sdev_attr_groups, \
.change_queue_depth = ata_scsi_change_queue_depth, \
.tag_alloc_policy = BLK_TAG_ALLOC_RR, \
.slave_configure = ata_scsi_slave_config
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 3ca7720e7d8f..f845cee501e8 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1085,14 +1085,23 @@ static struct ata_port_operations ich_pata_ops = {
.set_dmamode = ich_set_dmamode,
};
-static struct device_attribute *piix_sidpr_shost_attrs[] = {
- &dev_attr_link_power_management_policy,
+static struct attribute *piix_sidpr_shost_attrs[] = {
+ &dev_attr_link_power_management_policy.attr,
+ NULL
+};
+
+static const struct attribute_group piix_sidpr_shost_attr_group = {
+ .attrs = piix_sidpr_shost_attrs
+};
+
+static const struct attribute_group *piix_sidpr_shost_groups[] = {
+ &piix_sidpr_shost_attr_group,
NULL
};
static struct scsi_host_template piix_sidpr_sht = {
ATA_BMDMA_SHT(DRV_NAME),
- .shost_attrs = piix_sidpr_shost_attrs,
+ .shost_groups = piix_sidpr_shost_groups,
};
static struct ata_port_operations piix_sidpr_sata_ops = {
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 5b3fa2cbe722..ebf990944054 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -108,28 +108,46 @@ static DEVICE_ATTR(em_buffer, S_IWUSR | S_IRUGO,
ahci_read_em_buffer, ahci_store_em_buffer);
static DEVICE_ATTR(em_message_supported, S_IRUGO, ahci_show_em_supported, NULL);
-struct device_attribute *ahci_shost_attrs[] = {
- &dev_attr_link_power_management_policy,
- &dev_attr_em_message_type,
- &dev_attr_em_message,
- &dev_attr_ahci_host_caps,
- &dev_attr_ahci_host_cap2,
- &dev_attr_ahci_host_version,
- &dev_attr_ahci_port_cmd,
- &dev_attr_em_buffer,
- &dev_attr_em_message_supported,
+static struct attribute *ahci_shost_attrs[] = {
+ &dev_attr_link_power_management_policy.attr,
+ &dev_attr_em_message_type.attr,
+ &dev_attr_em_message.attr,
+ &dev_attr_ahci_host_caps.attr,
+ &dev_attr_ahci_host_cap2.attr,
+ &dev_attr_ahci_host_version.attr,
+ &dev_attr_ahci_port_cmd.attr,
+ &dev_attr_em_buffer.attr,
+ &dev_attr_em_message_supported.attr,
NULL
};
-EXPORT_SYMBOL_GPL(ahci_shost_attrs);
-struct device_attribute *ahci_sdev_attrs[] = {
- &dev_attr_sw_activity,
- &dev_attr_unload_heads,
- &dev_attr_ncq_prio_supported,
- &dev_attr_ncq_prio_enable,
+static const struct attribute_group ahci_shost_attr_group = {
+ .attrs = ahci_shost_attrs
+};
+
+const struct attribute_group *ahci_shost_attr_groups[] = {
+ &ahci_shost_attr_group,
+ NULL
+};
+EXPORT_SYMBOL_GPL(ahci_shost_attr_groups);
+
+struct attribute *ahci_sdev_attrs[] = {
+ &dev_attr_sw_activity.attr,
+ &dev_attr_unload_heads.attr,
+ &dev_attr_ncq_prio_supported.attr,
+ &dev_attr_ncq_prio_enable.attr,
+ NULL
+};
+
+static const struct attribute_group ahci_sdev_attr_group = {
+ .attrs = ahci_sdev_attrs
+};
+
+const struct attribute_group *ahci_sdev_attr_groups[] = {
+ &ahci_sdev_attr_group,
NULL
};
-EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
+EXPORT_SYMBOL_GPL(ahci_sdev_attr_groups);
struct ata_port_operations ahci_ops = {
.inherits = &sata_pmp_port_ops,
diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c
index 8f3ff830ab0c..0d332b40ec42 100644
--- a/drivers/ata/libata-sata.c
+++ b/drivers/ata/libata-sata.c
@@ -922,13 +922,22 @@ DEVICE_ATTR(ncq_prio_enable, S_IRUGO | S_IWUSR,
ata_ncq_prio_enable_show, ata_ncq_prio_enable_store);
EXPORT_SYMBOL_GPL(dev_attr_ncq_prio_enable);
-struct device_attribute *ata_ncq_sdev_attrs[] = {
- &dev_attr_unload_heads,
- &dev_attr_ncq_prio_enable,
- &dev_attr_ncq_prio_supported,
+struct attribute *ata_ncq_sdev_attrs[] = {
+ &dev_attr_unload_heads.attr,
+ &dev_attr_ncq_prio_enable.attr,
+ &dev_attr_ncq_prio_supported.attr,
NULL
};
-EXPORT_SYMBOL_GPL(ata_ncq_sdev_attrs);
+
+static const struct attribute_group ata_ncq_sdev_attr_group = {
+ .attrs = ata_ncq_sdev_attrs
+};
+
+const struct attribute_group *ata_ncq_sdev_attr_groups[] = {
+ &ata_ncq_sdev_attr_group,
+ NULL
+};
+EXPORT_SYMBOL_GPL(ata_ncq_sdev_attr_groups);
static ssize_t
ata_scsi_em_message_store(struct device *dev, struct device_attribute *attr,
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 1fb4611f7eeb..84c696960f4c 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -234,11 +234,20 @@ static void ata_scsi_set_invalid_parameter(struct ata_device *dev,
field, 0xff, 0);
}
-struct device_attribute *ata_common_sdev_attrs[] = {
- &dev_attr_unload_heads,
+static struct attribute *ata_common_sdev_attrs[] = {
+ &dev_attr_unload_heads.attr,
NULL
};
-EXPORT_SYMBOL_GPL(ata_common_sdev_attrs);
+
+static const struct attribute_group ata_common_sdev_attr_group = {
+ .attrs = ata_common_sdev_attrs
+};
+
+const struct attribute_group *ata_common_sdev_attr_groups[] = {
+ &ata_common_sdev_attr_group,
+ NULL
+};
+EXPORT_SYMBOL_GPL(ata_common_sdev_attr_groups);
/**
* ata_std_bios_param - generic bios head/sector/cylinder calculator used by sd.
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index be0ca8d5b345..a7a6a26175fe 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -923,7 +923,7 @@ static struct scsi_host_template pata_macio_sht = {
*/
.max_segment_size = MAX_DBDMA_SEG,
.slave_configure = pata_macio_slave_config,
- .sdev_attrs = ata_common_sdev_attrs,
+ .sdev_groups = ata_common_sdev_attr_groups,
.can_queue = ATA_DEF_QUEUE,
.tag_alloc_policy = BLK_TAG_ALLOC_RR,
};
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 9d86203e1e7a..35a97b7c2791 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -670,7 +670,7 @@ static struct scsi_host_template mv6_sht = {
.can_queue = MV_MAX_Q_DEPTH - 1,
.sg_tablesize = MV_MAX_SG_CT / 2,
.dma_boundary = MV_DMA_BOUNDARY,
- .sdev_attrs = ata_ncq_sdev_attrs,
+ .sdev_groups = ata_ncq_sdev_attr_groups,
.change_queue_depth = ata_scsi_change_queue_depth,
.tag_alloc_policy = BLK_TAG_ALLOC_RR,
.slave_configure = ata_scsi_slave_config
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index c385d18ce87b..7ff1a2f30cea 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -380,7 +380,7 @@ static struct scsi_host_template nv_adma_sht = {
.sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN,
.dma_boundary = NV_ADMA_DMA_BOUNDARY,
.slave_configure = nv_adma_slave_config,
- .sdev_attrs = ata_ncq_sdev_attrs,
+ .sdev_groups = ata_ncq_sdev_attr_groups,
.change_queue_depth = ata_scsi_change_queue_depth,
.tag_alloc_policy = BLK_TAG_ALLOC_RR,
};
@@ -391,7 +391,7 @@ static struct scsi_host_template nv_swncq_sht = {
.sg_tablesize = LIBATA_MAX_PRD,
.dma_boundary = ATA_DMA_BOUNDARY,
.slave_configure = nv_swncq_slave_config,
- .sdev_attrs = ata_ncq_sdev_attrs,
+ .sdev_groups = ata_ncq_sdev_attr_groups,
.change_queue_depth = ata_scsi_change_queue_depth,
.tag_alloc_policy = BLK_TAG_ALLOC_RR,
};
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 06a1e27c4f84..ada0dbb9f703 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -379,7 +379,7 @@ static struct scsi_host_template sil24_sht = {
.sg_tablesize = SIL24_MAX_SGE,
.dma_boundary = ATA_DMA_BOUNDARY,
.tag_alloc_policy = BLK_TAG_ALLOC_FIFO,
- .sdev_attrs = ata_ncq_sdev_attrs,
+ .sdev_groups = ata_ncq_sdev_attr_groups,
.change_queue_depth = ata_scsi_change_queue_depth,
.slave_configure = ata_scsi_slave_config
};
diff --git a/include/linux/libata.h b/include/linux/libata.h
index c0c64f03e107..6df8d0034d77 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1388,7 +1388,7 @@ extern int ata_link_nr_enabled(struct ata_link *link);
*/
extern const struct ata_port_operations ata_base_port_ops;
extern const struct ata_port_operations sata_port_ops;
-extern struct device_attribute *ata_common_sdev_attrs[];
+extern const struct attribute_group *ata_common_sdev_attr_groups[];
/*
* All sht initializers (BASE, PIO, BMDMA, NCQ) must be instantiated
@@ -1418,14 +1418,14 @@ extern struct device_attribute *ata_common_sdev_attrs[];
#define ATA_BASE_SHT(drv_name) \
ATA_SUBBASE_SHT(drv_name), \
- .sdev_attrs = ata_common_sdev_attrs
+ .sdev_groups = ata_common_sdev_attr_groups
#ifdef CONFIG_SATA_HOST
-extern struct device_attribute *ata_ncq_sdev_attrs[];
+extern const struct attribute_group *ata_ncq_sdev_attr_groups[];
#define ATA_NCQ_SHT(drv_name) \
ATA_SUBBASE_SHT(drv_name), \
- .sdev_attrs = ata_ncq_sdev_attrs, \
+ .sdev_groups = ata_ncq_sdev_attr_groups, \
.change_queue_depth = ata_scsi_change_queue_depth
#endif
next prev parent reply other threads:[~2021-10-07 21:19 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 21:18 [PATCH v2 00/46] Register SCSI sysfs attributes earlier Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 01/46] scsi: core: Register " Bart Van Assche
2021-10-07 21:18 ` Bart Van Assche [this message]
2021-10-07 21:18 ` [PATCH v2 03/46] firewire: sbp2: Switch to attribute groups Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 04/46] RDMA/srp: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 05/46] scsi: message: fusion: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 06/46] scsi: zfcp: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 07/46] scsi: 3w-9xxx: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 08/46] scsi: 3w-sas: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 09/46] scsi: 3w-xxxx: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 10/46] scsi: 53c700: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 11/46] scsi: aacraid: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 12/46] scsi: arcmsr: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 13/46] scsi: be2iscsi: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 14/46] scsi: bfa: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 15/46] scsi: bnx2fc: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 16/46] scsi: bnx2i: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 17/46] scsi: csiostor: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 18/46] scsi: cxlflash: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 19/46] scsi: fnic: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 20/46] scsi: hisi_sas: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 21/46] scsi: hpsa: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 22/46] scsi: hptiop: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 23/46] scsi: ibmvscsi: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 24/46] scsi: ibmvfc: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 25/46] scsi: ipr: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 26/46] scsi: isci: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 27/46] scsi: lpfc: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 28/46] scsi: megaraid: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 29/46] scsi: mpt3sas: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 30/46] scsi: mvsas: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 31/46] scsi: myrb: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 32/46] scsi: myrs: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 33/46] scsi: ncr53c8xx: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 34/46] scsi: sym53c500_cs: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 35/46] scsi: pm8001: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 36/46] scsi: pmcraid: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 37/46] scsi: qedf: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 38/46] scsi: qedi: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 39/46] scsi: qla2xxx: Remove a declaration Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 40/46] scsi: qla2xxx: Switch to attribute groups Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 41/46] scsi: qla4xxx: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 42/46] scsi: smartpqi: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 43/46] scsi: snic: " Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 44/46] scsi: unisys: Remove the shost_attrs member Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 45/46] scsi: usb: Switch to attribute groups Bart Van Assche
2021-10-08 5:39 ` Greg Kroah-Hartman
2021-10-08 20:19 ` Bart Van Assche
2021-10-07 21:18 ` [PATCH v2 46/46] scsi: core: Remove two host template members that are no longer used Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211007211852.256007-3-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=damien.lemoal@opensource.wdc.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.