ide: remove ->dma_vendor{1,3} fields from ide_hwif_t

* Use 'hwif->dma_base + {1,3}' instead of hwif->dma_vendor{1,3} in
  pdc202xx_new host driver.

* Remove no longer needed ->dma_vendor{1,3} fields from ide_hwif_t.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 4 insertions, 8 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index c352cf27b6e7..767820db7cae 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -858,12 +858,8 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base)
 
         if (!hwif->dma_command)
                 hwif->dma_command       = hwif->dma_base + 0;
-        if (!hwif->dma_vendor1)
-                hwif->dma_vendor1       = hwif->dma_base + 1;
         if (!hwif->dma_status)
                 hwif->dma_status        = hwif->dma_base + 2;
-        if (!hwif->dma_vendor3)
-                hwif->dma_vendor3       = hwif->dma_base + 3;
         if (!hwif->dma_prdtable)
                 hwif->dma_prdtable      = hwif->dma_base + 4;
 
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index ec9bd7b352fc..070df8ab3b21 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -83,8 +83,8 @@ static u8 get_indexed_reg(ide_hwif_t *hwif, u8 index)
 {
         u8 value;
 
-        outb(index, hwif->dma_vendor1);
-        value = inb(hwif->dma_vendor3);
+        outb(index, hwif->dma_base + 1);
+        value = inb(hwif->dma_base + 3);
 
         DBG("index[%02X] value[%02X]\n", index, value);
         return value;
@@ -97,8 +97,8 @@ static u8 get_indexed_reg(ide_hwif_t *hwif, u8 index)
  */
 static void set_indexed_reg(ide_hwif_t *hwif, u8 index, u8 value)
 {
-        outb(index, hwif->dma_vendor1);
-        outb(value, hwif->dma_vendor3);
+        outb(index, hwif->dma_base + 1);
+        outb(value, hwif->dma_base + 3);
         DBG("index[%02X] value[%02X]\n", index, value);
 }