1 files changed, 15 insertions, 8 deletions

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 397c6cbe953..1f1135ce7cd 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -801,9 +801,9 @@ static void hpt370_irq_timeout(ide_drive_t *drive)
         printk(KERN_DEBUG "%s: %d bytes in FIFO\n", drive->name, bfifo & 0x1ff);
 
         /* get DMA command mode */
-        dma_cmd = inb(hwif->dma_command);
+        dma_cmd = inb(hwif->dma_base + ATA_DMA_CMD);
         /* stop DMA */
-        outb(dma_cmd & ~0x1, hwif->dma_command);
+        outb(dma_cmd & ~0x1, hwif->dma_base + ATA_DMA_CMD);
         hpt370_clear_engine(drive);
 }
 
@@ -818,12 +818,12 @@ static void hpt370_dma_start(ide_drive_t *drive)
 static int hpt370_dma_end(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
-        u8  dma_stat            = inb(hwif->dma_status);
+        u8  dma_stat            = inb(hwif->dma_base + ATA_DMA_STATUS);
 
         if (dma_stat & 0x01) {
                 /* wait a little */
                 udelay(20);
-                dma_stat = inb(hwif->dma_status);
+                dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS);
                 if (dma_stat & 0x01)
                         hpt370_irq_timeout(drive);
         }
@@ -850,7 +850,7 @@ static int hpt374_dma_test_irq(ide_drive_t *drive)
                 return 0;
         }
 
-        dma_stat = inb(hwif->dma_status);
+        dma_stat = inb(hwif->dma_base + ATA_DMA_STATUS);
         /* return 1 if INTR asserted */
         if (dma_stat & 4)
                 return 1;
@@ -1320,7 +1320,15 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif,
         unsigned long flags, base = ide_pci_dma_base(hwif, d);
         u8 dma_old, dma_new, masterdma = 0, slavedma = 0;
 
-        if (base == 0 || ide_pci_set_master(dev, d->name) < 0)
+        if (base == 0)
+                return -1;
+
+        hwif->dma_base = base;
+
+        if (ide_pci_check_simplex(hwif, d) < 0)
+                return -1;
+
+        if (ide_pci_set_master(dev, d->name) < 0)
                 return -1;
 
         dma_old = inb(base + 2);
@@ -1346,7 +1354,7 @@ static int __devinit init_dma_hpt366(ide_hwif_t *hwif,
         if (ide_allocate_dma_engine(hwif))
                 return -1;
 
-        ide_setup_dma(hwif, base);
+        hwif->dma_ops = &sff_dma_ops;
 
         return 0;
 }
@@ -1401,7 +1409,6 @@ static int __devinit hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2)
 
 #define IDE_HFLAGS_HPT3XX \
         (IDE_HFLAG_NO_ATAPI_DMA | \
-         IDE_HFLAG_ABUSE_SET_DMA_MODE | \
          IDE_HFLAG_OFF_BOARD)
 
 static const struct ide_port_ops hpt3xx_port_ops = {