Hello Paolo,
On Tue, Jun 04, 2024 at 06:22:17PM +0200, Paolo Pisati wrote:
pata_buddha_data_xfer(), pata_gayle_data_xfer() and ata_sff_data_xfer() are the
same function, consolidate around libata::ata_sff_data_xfer().
Please avoid the C++ namespace operator,
just drop "libata::" here and in the subject.
Also please just split this into two patches, one per driver.
Signed-off-by: Paolo Pisati <p.pisati@xxxxxxxxx>
---
drivers/ata/pata_buddha.c | 40 ++-------------------------------------
drivers/ata/pata_gayle.c | 40 ++-------------------------------------
2 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/drivers/ata/pata_buddha.c b/drivers/ata/pata_buddha.c
index c36ee991d5e5..234278eb26e1 100644
--- a/drivers/ata/pata_buddha.c
+++ b/drivers/ata/pata_buddha.c
@@ -60,42 +60,6 @@ static const struct scsi_host_template pata_buddha_sht = {
ATA_PIO_SHT(DRV_NAME),
};
-/* FIXME: is this needed? */
-static unsigned int pata_buddha_data_xfer(struct ata_queued_cmd *qc,
- unsigned char *buf,
- unsigned int buflen, int rw)
-{
- struct ata_device *dev = qc->dev;
- struct ata_port *ap = dev->link->ap;
- void __iomem *data_addr = ap->ioaddr.data_addr;
- unsigned int words = buflen >> 1;
-
- /* Transfer multiple of 2 bytes */
- if (rw == READ)
- raw_insw((u16 *)data_addr, (u16 *)buf, words);
- else
- raw_outsw((u16 *)data_addr, (u16 *)buf, words);
-
- /* Transfer trailing byte, if any. */
- if (unlikely(buflen & 0x01)) {
- unsigned char pad[2] = { };
-
- /* Point buf to the tail of buffer */
- buf += buflen - 1;
-
- if (rw == READ) {
- raw_insw((u16 *)data_addr, (u16 *)pad, 1);
- *buf = pad[0];
- } else {
- pad[0] = *buf;
- raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
- }
- words++;
- }
-
- return words << 1;
-}
-
/*
* Provide our own set_mode() as we don't want to change anything that has
* already been configured..
@@ -131,7 +95,7 @@ static void pata_xsurf_irq_clear(struct ata_port *ap)
static struct ata_port_operations pata_buddha_ops = {
.inherits = &ata_sff_port_ops,
- .sff_data_xfer = pata_buddha_data_xfer,
+ .sff_data_xfer = ata_sff_data_xfer,
Since this driver inherits ata_sff_port_ops,
which sets .sff_data_xfer to ata_sff_data_xfer:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/ata/libata-sff.c?h=v6.10-rc2#n46
this line should not be needed.
.sff_irq_check = pata_buddha_irq_check,
.cable_detect = ata_cable_unknown,
.set_mode = pata_buddha_set_mode,
@@ -139,7 +103,7 @@ static struct ata_port_operations pata_buddha_ops = {
static struct ata_port_operations pata_xsurf_ops = {
.inherits = &ata_sff_port_ops,
- .sff_data_xfer = pata_buddha_data_xfer,
+ .sff_data_xfer = ata_sff_data_xfer,
.sff_irq_check = pata_buddha_irq_check,
.sff_irq_clear = pata_xsurf_irq_clear,
.cable_detect = ata_cable_unknown,
diff --git a/drivers/ata/pata_gayle.c b/drivers/ata/pata_gayle.c
index 3bdbe2b65a2b..febffc36a18f 100644
--- a/drivers/ata/pata_gayle.c
+++ b/drivers/ata/pata_gayle.c
@@ -38,42 +38,6 @@ static const struct scsi_host_template pata_gayle_sht = {
ATA_PIO_SHT(DRV_NAME),
};
-/* FIXME: is this needed? */
-static unsigned int pata_gayle_data_xfer(struct ata_queued_cmd *qc,
- unsigned char *buf,
- unsigned int buflen, int rw)
-{
- struct ata_device *dev = qc->dev;
- struct ata_port *ap = dev->link->ap;
- void __iomem *data_addr = ap->ioaddr.data_addr;
- unsigned int words = buflen >> 1;
-
- /* Transfer multiple of 2 bytes */
- if (rw == READ)
- raw_insw((u16 *)data_addr, (u16 *)buf, words);
- else
- raw_outsw((u16 *)data_addr, (u16 *)buf, words);
-
- /* Transfer trailing byte, if any. */
- if (unlikely(buflen & 0x01)) {
- unsigned char pad[2] = { };
-
- /* Point buf to the tail of buffer */
- buf += buflen - 1;
-
- if (rw == READ) {
- raw_insw((u16 *)data_addr, (u16 *)pad, 1);
- *buf = pad[0];
- } else {
- pad[0] = *buf;
- raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
- }
- words++;
- }
-
- return words << 1;
-}
-
/*
* Provide our own set_mode() as we don't want to change anything that has
* already been configured..
@@ -110,7 +74,7 @@ static void pata_gayle_irq_clear(struct ata_port *ap)
static struct ata_port_operations pata_gayle_a1200_ops = {
.inherits = &ata_sff_port_ops,
- .sff_data_xfer = pata_gayle_data_xfer,
+ .sff_data_xfer = ata_sff_data_xfer,
Same comment as for the other driver.
Kind regards,
Niklas
