ide: add struct ide_port_ops (take 2)

* Move hooks for port/host specific methods from ide_hwif_t to
  'struct ide_port_ops'.

* Add 'const struct ide_port_ops *port_ops' to 'struct ide_port_info'
  and ide_hwif_t.

* Update host drivers and core code accordingly.

While at it:

* Rename ata66_*() cable detect functions to *_cable_detect() to match
  the standard naming. (Suggested by Sergei Shtylyov)

v2:
* Fix build for bast-ide. (Noticed by Andrew Morton)

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 790a7759d455..c64b4c1b8e50 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -782,8 +782,14 @@ static void __init cris_setup_ports(hw_regs_t *hw, unsigned long base)
         hw->ack_intr = cris_ide_ack_intr;
 }
 
+static const struct ide_port_ops cris_port_ops = {
+        .set_pio_mode           = cris_set_pio_mode,
+        .set_dma_mode           = cris_set_dma_mode,
+};
+
 static const struct ide_port_info cris_port_info __initdata = {
         .chipset                = ide_etrax100,
+        .port_ops               = &cris_port_ops,
         .host_flags             = IDE_HFLAG_NO_ATAPI_DMA |
                                   IDE_HFLAG_NO_DMA, /* no SFF-style DMA */
         .pio_mask               = ATA_PIO4,
@@ -810,8 +816,6 @@ static int __init init_e100_ide(void)
                 ide_init_port_data(hwif, hwif->index);
                 ide_init_port_hw(hwif, &hw);
                 hwif->mmio = 1;
-                hwif->set_pio_mode = &cris_set_pio_mode;
-                hwif->set_dma_mode = &cris_set_dma_mode;
                 hwif->ata_input_data = &cris_ide_input_data;
                 hwif->ata_output_data = &cris_ide_output_data;
                 hwif->atapi_input_bytes = &cris_atapi_input_bytes;