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, 9 insertions, 10 deletions

diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 6bd9523cf642..22ac0f70c423 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -552,16 +552,6 @@ static void __devinit
 ide_init_sgiioc4(ide_hwif_t * hwif)
 {
         hwif->mmio = 1;
-        hwif->set_pio_mode = NULL; /* Sets timing for PIO mode */
-        hwif->set_dma_mode = &sgiioc4_set_dma_mode;
-        hwif->selectproc = NULL;/* Use the default routine to select drive */
-        hwif->reset_poll = NULL;/* No HBA specific reset_poll needed */
-        hwif->pre_reset = NULL; /* No HBA specific pre_set needed */
-        hwif->resetproc = &sgiioc4_resetproc;/* Reset DMA engine,
-                                                clear interrupts */
-        hwif->maskproc = &sgiioc4_maskproc;     /* Mask on/off NIEN register */
-        hwif->quirkproc = NULL;
-
         hwif->INB = &sgiioc4_INB;
 
         if (hwif->dma_base == 0)
@@ -576,8 +566,17 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         hwif->dma_timeout = &ide_dma_timeout;
 }
 
+static const struct ide_port_ops sgiioc4_port_ops = {
+        .set_dma_mode           = sgiioc4_set_dma_mode,
+        /* reset DMA engine, clear IRQs */
+        .resetproc              = sgiioc4_resetproc,
+        /* mask on/off NIEN register */
+        .maskproc               = sgiioc4_maskproc,
+};
+
 static const struct ide_port_info sgiioc4_port_info __devinitdata = {
         .chipset                = ide_pci,
+        .port_ops               = &sgiioc4_port_ops,
         .host_flags             = IDE_HFLAG_NO_DMA | /* no SFF-style DMA */
                                   IDE_HFLAG_NO_AUTOTUNE,
         .mwdma_mask             = ATA_MWDMA2_ONLY,