ide: remove ->dma_master field from ide_hwif_t (take 5)

* Convert cmd64x, hpt366 and pdc202xx_old host drivers to use
  pci_resource_start(hwif->pci_dev, 4) instead of hwif->dma_master.

* Remove no longer needed ->dma_master field from ide_hwif_t.

v2:
* Use the more readable 'hwif->dma_base - (hwif->channel * 8)' instead of
  pci_resource_start(hwif->pci_dev, 4).

v3:
* Use hwif->extra_base in hpt366/pdc20xx_old + some cosmetic fixups over v2
  (suggested by Sergei).

v4:
* Correct offsets in hpt3xxn_set_clock().

v5:
* Use hwif->extra_base in hpt366 for _real_ this time. (Noticed by Sergei)

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index df14d692743c..d3826a66834d 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -894,32 +894,33 @@ static int hpt374_ide_dma_end(ide_drive_t *drive)
 
 static void hpt3xxn_set_clock(ide_hwif_t *hwif, u8 mode)
 {
-        u8 scr2 = inb(hwif->dma_master + 0x7b);
+        unsigned long base = hwif->extra_base;
+        u8 scr2 = inb(base + 0x6b);
 
         if ((scr2 & 0x7f) == mode)
                 return;
 
         /* Tristate the bus */
-        outb(0x80, hwif->dma_master + 0x73);
-        outb(0x80, hwif->dma_master + 0x77);
+        outb(0x80, base + 0x63);
+        outb(0x80, base + 0x67);
 
         /* Switch clock and reset channels */
-        outb(mode, hwif->dma_master + 0x7b);
-        outb(0xc0, hwif->dma_master + 0x79);
+        outb(mode, base + 0x6b);
+        outb(0xc0, base + 0x69);
 
         /*
          * Reset the state machines.
          * NOTE: avoid accidentally enabling the disabled channels.
          */
-        outb(inb(hwif->dma_master + 0x70) | 0x32, hwif->dma_master + 0x70);
-        outb(inb(hwif->dma_master + 0x74) | 0x32, hwif->dma_master + 0x74);
+        outb(inb(base + 0x60) | 0x32, base + 0x60);
+        outb(inb(base + 0x64) | 0x32, base + 0x64);
 
         /* Complete reset */
-        outb(0x00, hwif->dma_master + 0x79);
+        outb(0x00, base + 0x69);
 
         /* Reconnect channels to bus */
-        outb(0x00, hwif->dma_master + 0x73);
-        outb(0x00, hwif->dma_master + 0x77);
+        outb(0x00, base + 0x63);
+        outb(0x00, base + 0x67);
 }
 
 /**