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, 16 insertions, 13 deletions

diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 38765d9b0314..5b1a0e950dfd 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -808,19 +808,6 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
 
         ide_set_hwifdata(hwif, ports);
 
-        hwif->exec_command        = scc_exec_command;
-        hwif->read_status         = scc_read_status;
-        hwif->read_altstatus      = scc_read_altstatus;
-        hwif->read_sff_dma_status = scc_read_sff_dma_status;
-
-        hwif->set_irq = scc_set_irq;
-
-        hwif->tf_load = scc_tf_load;
-        hwif->tf_read = scc_tf_read;
-
-        hwif->input_data  = scc_input_data;
-        hwif->output_data = scc_output_data;
-
         hwif->dma_base = dma_base;
         hwif->config_data = ports->ctl;
 }
@@ -872,6 +859,21 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
                 hwif->ultra_mask = ATA_UDMA5; /* 100MHz */
 }
 
+static const struct ide_tp_ops scc_tp_ops = {
+        .exec_command           = scc_exec_command,
+        .read_status            = scc_read_status,
+        .read_altstatus         = scc_read_altstatus,
+        .read_sff_dma_status    = scc_read_sff_dma_status,
+
+        .set_irq                = scc_set_irq,
+
+        .tf_load                = scc_tf_load,
+        .tf_read                = scc_tf_read,
+
+        .input_data             = scc_input_data,
+        .output_data            = scc_output_data,
+};
+
 static const struct ide_port_ops scc_port_ops = {
         .set_pio_mode           = scc_set_pio_mode,
         .set_dma_mode           = scc_set_dma_mode,
@@ -895,6 +897,7 @@ static const struct ide_dma_ops scc_dma_ops = {
       .name             = name_str,                     \
       .init_iops        = init_iops_scc,                \
       .init_hwif        = init_hwif_scc,                \
+      .tp_ops           = &scc_tp_ops,          \
       .port_ops         = &scc_port_ops,                \
       .dma_ops          = &scc_dma_ops,                 \
       .host_flags       = IDE_HFLAG_SINGLE,             \