13 files changed, 37 insertions, 45 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 45b6b29bc10f..074a46e5bbdd 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -3527,7 +3527,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
 
 /**
  *      ata_mmio_data_xfer - Transfer data by MMIO
- *      @ap: port to read/write
+ *      @dev: device for this I/O
  *      @buf: data buffer
  *      @buflen: buffer length
  *      @write_data: read/write
@@ -3538,9 +3538,10 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
  *      Inherited from caller.
  */
 
-static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,
-                               unsigned int buflen, int write_data)
+void ata_mmio_data_xfer(struct ata_device *adev, unsigned char *buf, 
+                        unsigned int buflen, int write_data)
 {
+        struct ata_port *ap = adev->ap;
         unsigned int i;
         unsigned int words = buflen >> 1;
         u16 *buf16 = (u16 *) buf;
@@ -3572,7 +3573,7 @@ static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,
 
 /**
  *      ata_pio_data_xfer - Transfer data by PIO
- *      @ap: port to read/write
+ *      @adev: device to target
  *      @buf: data buffer
  *      @buflen: buffer length
  *      @write_data: read/write
@@ -3583,9 +3584,10 @@ static void ata_mmio_data_xfer(struct ata_port *ap, unsigned char *buf,
  *      Inherited from caller.
  */
 
-static void ata_pio_data_xfer(struct ata_port *ap, unsigned char *buf,
-                              unsigned int buflen, int write_data)
+void ata_pio_data_xfer(struct ata_device *adev, unsigned char *buf, 
+                       unsigned int buflen, int write_data)
 {
+        struct ata_port *ap = adev->ap;
         unsigned int words = buflen >> 1;
 
         /* Transfer multiple of 2 bytes */
@@ -3610,39 +3612,6 @@ static void ata_pio_data_xfer(struct ata_port *ap, unsigned char *buf,
 }
 
 /**
- *      ata_data_xfer - Transfer data from/to the data register.
- *      @ap: port to read/write
- *      @buf: data buffer
- *      @buflen: buffer length
- *      @do_write: read/write
- *
- *      Transfer data from/to the device data register.
- *
- *      LOCKING:
- *      Inherited from caller.
- */
-
-static void ata_data_xfer(struct ata_port *ap, unsigned char *buf,
-                          unsigned int buflen, int do_write)
-{
-        /* Make the crap hardware pay the costs not the good stuff */
-        if (unlikely(ap->flags & ATA_FLAG_IRQ_MASK)) {
-                unsigned long flags;
-                local_irq_save(flags);
-                if (ap->flags & ATA_FLAG_MMIO)
-                        ata_mmio_data_xfer(ap, buf, buflen, do_write);
-                else
-                        ata_pio_data_xfer(ap, buf, buflen, do_write);
-                local_irq_restore(flags);
-        } else {
-                if (ap->flags & ATA_FLAG_MMIO)
-                        ata_mmio_data_xfer(ap, buf, buflen, do_write);
-                else
-                        ata_pio_data_xfer(ap, buf, buflen, do_write);
-        }
-}
-
-/**
  *      ata_pio_sector - Transfer ATA_SECT_SIZE (512 bytes) of data.
  *      @qc: Command on going
  *
@@ -3676,17 +3645,18 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
         if (PageHighMem(page)) {
                 unsigned long flags;
 
+                /* FIXME: use a bounce buffer */
                 local_irq_save(flags);
                 buf = kmap_atomic(page, KM_IRQ0);
 
                 /* do the actual data transfer */
-                ata_data_xfer(ap, buf + offset, ATA_SECT_SIZE, do_write);
+                ap->ops->data_xfer(qc->dev, buf + offset, ATA_SECT_SIZE, do_write);
 
                 kunmap_atomic(buf, KM_IRQ0);
                 local_irq_restore(flags);
         } else {
                 buf = page_address(page);
-                ata_data_xfer(ap, buf + offset, ATA_SECT_SIZE, do_write);
+                ap->ops->data_xfer(qc->dev, buf + offset, ATA_SECT_SIZE, do_write);
         }
 
         qc->cursect++;
@@ -3742,7 +3712,7 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)
         DPRINTK("send cdb\n");
         WARN_ON(qc->dev->cdb_len < 12);
 
-        ata_data_xfer(ap, qc->cdb, qc->dev->cdb_len, 1);
+        ap->ops->data_xfer(qc->dev, qc->cdb, qc->dev->cdb_len, 1);
         ata_altstatus(ap); /* flush */
 
         switch (qc->tf.protocol) {
@@ -3802,7 +3772,7 @@ next_sg:
                                        "%u bytes trailing data\n", bytes);
 
                 for (i = 0; i < words; i++)
-                        ata_data_xfer(ap, (unsigned char*)pad_buf, 2, do_write);
+                        ap->ops->data_xfer(qc->dev, (unsigned char*)pad_buf, 2, do_write);
 
                 ap->hsm_task_state = HSM_ST_LAST;
                 return;
@@ -3828,17 +3798,18 @@ next_sg:
         if (PageHighMem(page)) {
                 unsigned long flags;
 
+                /* FIXME: use bounce buffer */
                 local_irq_save(flags);
                 buf = kmap_atomic(page, KM_IRQ0);
 
                 /* do the actual data transfer */
-                ata_data_xfer(ap, buf + offset, count, do_write);
+                ap->ops->data_xfer(qc->dev,  buf + offset, count, do_write);
 
                 kunmap_atomic(buf, KM_IRQ0);
                 local_irq_restore(flags);
         } else {
                 buf = page_address(page);
-                ata_data_xfer(ap, buf + offset, count, do_write);
+                ap->ops->data_xfer(qc->dev,  buf + offset, count, do_write);
         }
 
         bytes -= count;
@@ -5702,6 +5673,8 @@ EXPORT_SYMBOL_GPL(ata_port_start);
 EXPORT_SYMBOL_GPL(ata_port_stop);
 EXPORT_SYMBOL_GPL(ata_host_stop);
 EXPORT_SYMBOL_GPL(ata_interrupt);
+EXPORT_SYMBOL_GPL(ata_mmio_data_xfer);
+EXPORT_SYMBOL_GPL(ata_pio_data_xfer);
 EXPORT_SYMBOL_GPL(ata_qc_prep);
 EXPORT_SYMBOL_GPL(ata_noop_qc_prep);
 EXPORT_SYMBOL_GPL(ata_bmdma_setup);
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 691c115ac8e1..bf3529fdea9c 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -406,6 +406,7 @@ static const struct ata_port_operations mv5_ops = {
 
         .qc_prep                = mv_qc_prep,
         .qc_issue               = mv_qc_issue,
+        .data_xfer              = ata_mmio_data_xfer,
 
         .eng_timeout            = mv_eng_timeout,
 
@@ -433,6 +434,7 @@ static const struct ata_port_operations mv6_ops = {
 
         .qc_prep                = mv_qc_prep,
         .qc_issue               = mv_qc_issue,
+        .data_xfer              = ata_mmio_data_xfer,
 
         .eng_timeout            = mv_eng_timeout,
 
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 043ff4fd9ba7..d93513ef7412 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -234,6 +234,7 @@ static const struct ata_port_operations nv_ops = {
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
         .eng_timeout            = ata_eng_timeout,
+        .data_xfer              = ata_pio_data_xfer,
         .irq_handler            = nv_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
         .scr_read               = nv_scr_read,
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 285ab0263d91..01111594d09c 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -137,6 +137,7 @@ static const struct ata_port_operations pdc_sata_ops = {
         .qc_prep                = pdc_qc_prep,
         .qc_issue               = pdc_qc_issue_prot,
         .eng_timeout            = pdc_eng_timeout,
+        .data_xfer              = ata_mmio_data_xfer,
         .irq_handler            = pdc_interrupt,
         .irq_clear              = pdc_irq_clear,
 
@@ -159,6 +160,7 @@ static const struct ata_port_operations pdc_pata_ops = {
 
         .qc_prep                = pdc_qc_prep,
         .qc_issue               = pdc_qc_issue_prot,
+        .data_xfer              = ata_mmio_data_xfer,
         .eng_timeout            = pdc_eng_timeout,
         .irq_handler            = pdc_interrupt,
         .irq_clear              = pdc_irq_clear,
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 54283e06070e..68737cadd2d4 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -156,6 +156,7 @@ static const struct ata_port_operations qs_ata_ops = {
         .phy_reset              = qs_phy_reset,
         .qc_prep                = qs_qc_prep,
         .qc_issue               = qs_qc_issue,
+        .data_xfer              = ata_mmio_data_xfer,
         .eng_timeout            = qs_eng_timeout,
         .irq_handler            = qs_intr,
         .irq_clear              = qs_irq_clear,
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index aa63044eed2e..3bd807738698 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -176,6 +176,7 @@ static const struct ata_port_operations sil_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
+        .data_xfer              = ata_mmio_data_xfer,
         .freeze                 = sil_freeze,
         .thaw                   = sil_thaw,
         .error_handler          = ata_bmdma_error_handler,
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 3097821688dc..82a07bff7e91 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -113,6 +113,7 @@ static const struct ata_port_operations sis_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
+        .data_xfer              = ata_pio_data_xfer,
         .eng_timeout            = ata_eng_timeout,
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index d5eb5375e265..7a4703bfa12a 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -320,6 +320,7 @@ static const struct ata_port_operations k2_sata_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
+        .data_xfer              = ata_mmio_data_xfer,
         .eng_timeout            = ata_eng_timeout,
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index e799ef35e9db..c4db6bf14a25 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -204,6 +204,7 @@ static const struct ata_port_operations pdc_20621_ops = {
         .phy_reset              = pdc_20621_phy_reset,
         .qc_prep                = pdc20621_qc_prep,
         .qc_issue               = pdc20621_qc_issue_prot,
+        .data_xfer              = ata_mmio_data_xfer,
         .eng_timeout            = pdc_eng_timeout,
         .irq_handler            = pdc20621_interrupt,
         .irq_clear              = pdc20621_irq_clear,
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 15f81bfc30f0..7fae3e06e461 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -110,6 +110,7 @@ static const struct ata_port_operations uli_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
+        .data_xfer              = ata_pio_data_xfer,
 
         .eng_timeout            = ata_eng_timeout,
 
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 17aefab5f42f..1c9e2f36805a 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -124,6 +124,7 @@ static const struct ata_port_operations svia_sata_ops = {
 
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
+        .data_xfer              = ata_pio_data_xfer,
 
         .eng_timeout            = ata_eng_timeout,
 
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index 0372be7ff1c9..438e7c6a0f8f 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -297,6 +297,7 @@ static const struct ata_port_operations vsc_sata_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
+        .data_xfer              = ata_pio_data_xfer,
         .eng_timeout            = ata_eng_timeout,
         .irq_handler            = vsc_sata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
diff --git a/include/linux/libata.h b/include/linux/libata.h
index c51502c047a4..25a6bf181599 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -525,6 +525,8 @@ struct ata_port_operations {
         void (*bmdma_setup) (struct ata_queued_cmd *qc);
         void (*bmdma_start) (struct ata_queued_cmd *qc);
 
+        void (*data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);
+
         void (*qc_prep) (struct ata_queued_cmd *qc);
         unsigned int (*qc_issue) (struct ata_queued_cmd *qc);
 
@@ -646,6 +648,10 @@ extern int ata_port_start (struct ata_port *ap);
 extern void ata_port_stop (struct ata_port *ap);
 extern void ata_host_stop (struct ata_host_set *host_set);
 extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs);
+extern void ata_mmio_data_xfer(struct ata_device *adev, unsigned char *buf,
+                               unsigned int buflen, int write_data);
+extern void ata_pio_data_xfer(struct ata_device *adev, unsigned char *buf,
+                              unsigned int buflen, int write_data);
 extern void ata_qc_prep(struct ata_queued_cmd *qc);
 extern void ata_noop_qc_prep(struct ata_queued_cmd *qc);
 extern unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc);