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, 4 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 8757e5ef6c95..dc4bc06f9871 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -574,6 +574,7 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)
 {
         struct hd_driveid *id = drive->id;
         ide_hwif_t *hwif = drive->hwif;
+        const struct ide_port_ops *port_ops = hwif->port_ops;
         unsigned int mask = 0;
 
         switch(base) {
@@ -581,8 +582,8 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)
                 if ((id->field_valid & 4) == 0)
                         break;
 
-                if (hwif->udma_filter)
-                        mask = hwif->udma_filter(drive);
+                if (port_ops && port_ops->udma_filter)
+                        mask = port_ops->udma_filter(drive);
                 else
                         mask = hwif->ultra_mask;
                 mask &= id->dma_ultra;
@@ -598,8 +599,8 @@ static unsigned int ide_get_mode_mask(ide_drive_t *drive, u8 base, u8 req_mode)
         case XFER_MW_DMA_0:
                 if ((id->field_valid & 2) == 0)
                         break;
-                if (hwif->mdma_filter)
-                        mask = hwif->mdma_filter(drive);
+                if (port_ops && port_ops->mdma_filter)
+                        mask = port_ops->mdma_filter(drive);
                 else
                         mask = hwif->mwdma_mask;
                 mask &= id->dma_mword;