ide: add struct ide_tp_ops (take 2)

* Add struct ide_tp_ops for transport methods.

* Add 'const struct ide_tp_ops *tp_ops' to struct ide_port_info
  and ide_hwif_t.

* Set the default hwif->tp_ops in ide_init_port_data().

* Set host driver specific hwif->tp_ops in ide_init_port().

* Export ide_exec_command(), ide_read_status(), ide_read_altstatus(),
  ide_read_sff_dma_status(), ide_set_irq(), ide_tf_{load,read}()
  and ata_{in,out}put_data().

* Convert host drivers and core code to use struct ide_tp_ops.

* Remove no longer needed default_hwif_transport().

* Cleanup ide_hwif_t from methods that are now in struct ide_tp_ops.

While at it:

* Use struct ide_port_info in falconide.c and q40ide.c.

* Rename ata_{in,out}put_data() to ide_{in,out}put_data().

v2:

* Fix missing convertion in ns87415.c.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index e72112efab9a..be99d463dcc7 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -104,7 +104,7 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive)
         u8 stat = 0, dma_stat = 0;
 
         dma_stat = hwif->dma_ops->dma_end(drive);
-        stat = hwif->read_status(hwif);
+        stat = hwif->tp_ops->read_status(hwif);
 
         if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) {
                 if (!dma_stat) {
@@ -335,7 +335,7 @@ static int config_drive_for_dma (ide_drive_t *drive)
 static int dma_timer_expiry (ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        u8 dma_stat             = hwif->read_sff_dma_status(hwif);
+        u8 dma_stat             = hwif->tp_ops->read_sff_dma_status(hwif);
 
         printk(KERN_WARNING "%s: dma_timer_expiry: dma status == 0x%02x\n",
                 drive->name, dma_stat);
@@ -370,7 +370,7 @@ void ide_dma_host_set(ide_drive_t *drive, int on)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         u8 unit                 = (drive->select.b.unit & 0x01);
-        u8 dma_stat             = hwif->read_sff_dma_status(hwif);
+        u8 dma_stat             = hwif->tp_ops->read_sff_dma_status(hwif);
 
         if (on)
                 dma_stat |= (1 << (5 + unit));
@@ -482,7 +482,7 @@ int ide_dma_setup(ide_drive_t *drive)
                 outb(reading, hwif->dma_base + ATA_DMA_CMD);
 
         /* read DMA status for INTR & ERROR flags */
-        dma_stat = hwif->read_sff_dma_status(hwif);
+        dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
 
         /* clear INTR & ERROR flags */
         if (mmio)
@@ -551,7 +551,7 @@ int __ide_dma_end (ide_drive_t *drive)
         }
 
         /* get DMA status */
-        dma_stat = hwif->read_sff_dma_status(hwif);
+        dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
 
         if (mmio)
                 /* clear the INTR & ERROR bits */
@@ -574,7 +574,7 @@ EXPORT_SYMBOL(__ide_dma_end);
 int ide_dma_test_irq(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        u8 dma_stat             = hwif->read_sff_dma_status(hwif);
+        u8 dma_stat             = hwif->tp_ops->read_sff_dma_status(hwif);
 
         /* return 1 if INTR asserted */
         if ((dma_stat & 4) == 4)