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

diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 52145796f12f..c01e2da5c9e6 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -703,24 +703,27 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
 
         hwif->dma_setup = scc_dma_setup;
         hwif->ide_dma_end = scc_ide_dma_end;
-        hwif->set_pio_mode = scc_set_pio_mode;
-        hwif->set_dma_mode = scc_set_dma_mode;
         hwif->ide_dma_test_irq = scc_dma_test_irq;
-        hwif->udma_filter = scc_udma_filter;
 
         if (in_be32((void __iomem *)(hwif->config_data + 0xff0)) & CCKCTRL_ATACLKOEN)
                 hwif->ultra_mask = ATA_UDMA6; /* 133MHz */
         else
                 hwif->ultra_mask = ATA_UDMA5; /* 100MHz */
-
-        hwif->cable_detect = scc_cable_detect;
 }
 
+static const struct ide_port_ops scc_port_ops = {
+        .set_pio_mode           = scc_set_pio_mode,
+        .set_dma_mode           = scc_set_dma_mode,
+        .udma_filter            = scc_udma_filter,
+        .cable_detect           = scc_cable_detect,
+};
+
 #define DECLARE_SCC_DEV(name_str)                       \
   {                                                     \
       .name             = name_str,                     \
       .init_iops        = init_iops_scc,                \
       .init_hwif        = init_hwif_scc,                \
+      .port_ops         = &scc_port_ops,                \
       .host_flags       = IDE_HFLAG_SINGLE,             \
       .pio_mask         = ATA_PIO4,                     \
   }