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/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 467656f06ccc..0fd98489d587 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -442,6 +442,10 @@ static void m8xx_ide_set_pio_mode(ide_drive_t *drive, const u8 pio)
 #endif /* defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_PCMCIA */
 }
 
+static const struct ide_port_ops m8xx_port_ops = {
+        .set_pio_mode           = m8xx_ide_set_pio_mode,
+};
+
 static void
 ide_interrupt_ack (void *dev)
 {
@@ -812,7 +816,7 @@ static int __init mpc8xx_ide_probe(void)
                 ide_init_port_hw(hwif, &hw);
                 hwif->mmio = 1;
                 hwif->pio_mask = ATA_PIO4;
-                hwif->set_pio_mode = m8xx_ide_set_pio_mode;
+                hwif->port_ops = &m8xx_port_ops;
 
                 idx[0] = 0;
         }
@@ -824,7 +828,7 @@ static int __init mpc8xx_ide_probe(void)
                 ide_init_port_hw(mate, &hw);
                 mate->mmio = 1;
                 mate->pio_mask = ATA_PIO4;
-                mate->set_pio_mode = m8xx_ide_set_pio_mode;
+                mate->port_ops = &m8xx_port_ops;
 
                 idx[1] = 1;
         }