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, 5 insertions, 2 deletions

diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index 4d90badd2bda..757156060a6b 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -120,8 +120,13 @@ static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio)
         spin_unlock_irqrestore(&ide_lock, flags);
 }
 
+static const struct ide_port_ops umc8672_port_ops = {
+        .set_pio_mode           = umc_set_pio_mode,
+};
+
 static const struct ide_port_info umc8672_port_info __initdata = {
         .chipset                = ide_umc8672,
+        .port_ops               = &umc8672_port_ops,
         .host_flags             = IDE_HFLAG_NO_DMA | IDE_HFLAG_NO_AUTOTUNE,
         .pio_mask               = ATA_PIO4,
 };
@@ -161,14 +166,12 @@ static int __init umc8672_probe(void)
         hwif = ide_find_port();
         if (hwif) {
                 ide_init_port_hw(hwif, &hw[0]);
-                hwif->set_pio_mode = umc_set_pio_mode;
                 idx[0] = hwif->index;
         }
 
         mate = ide_find_port();
         if (mate) {
                 ide_init_port_hw(mate, &hw[1]);
-                mate->set_pio_mode = umc_set_pio_mode;
                 idx[1] = mate->index;
         }