2 files changed, 14 insertions, 15 deletions

diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 3e75bf5f5e37..9ce1d8059921 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -821,6 +821,12 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif)
         init_mmio_iops_scc(hwif);
 }
 
+static int __devinit scc_init_dma(ide_hwif_t *hwif,
+                                  const struct ide_port_info *d)
+{
+        return ide_allocate_dma_engine(hwif);
+}
+
 static u8 scc_cable_detect(ide_hwif_t *hwif)
 {
         return ATA_CBL_PATA80;
@@ -885,6 +891,7 @@ static const struct ide_dma_ops scc_dma_ops = {
   {                                                     \
       .name             = name_str,                     \
       .init_iops        = init_iops_scc,                \
+      .init_dma         = scc_init_dma,                 \
       .init_hwif        = init_hwif_scc,                \
       .tp_ops           = &scc_tp_ops,          \
       .port_ops         = &scc_port_ops,                \
@@ -922,13 +929,6 @@ static void __devexit scc_remove(struct pci_dev *dev)
 {
         struct scc_ports *ports = pci_get_drvdata(dev);
         struct ide_host *host = ports->host;
-        ide_hwif_t *hwif = host->ports[0];
-
-        if (hwif->dmatable_cpu) {
-                pci_free_consistent(dev, PRD_ENTRIES * PRD_BYTES,
-                                    hwif->dmatable_cpu, hwif->dmatable_dma);
-                hwif->dmatable_cpu = NULL;
-        }
 
         ide_host_remove(host);
 
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 84cd986810cf..dd634541ce36 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -357,14 +357,13 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
         }
         hwif->dma_base = (unsigned long) virt_dma_base;
 
-        hwif->dmatable_cpu = pci_alloc_consistent(dev,
-                                          IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
-                                          &hwif->dmatable_dma);
+        hwif->sg_max_nents = IOC4_PRD_ENTRIES;
 
-        if (!hwif->dmatable_cpu)
-                goto dma_pci_alloc_failure;
+        hwif->prd_max_nents = IOC4_PRD_ENTRIES;
+        hwif->prd_ent_size = IOC4_PRD_BYTES;
 
-        hwif->sg_max_nents = IOC4_PRD_ENTRIES;
+        if (ide_allocate_dma_engine(hwif))
+                goto dma_pci_alloc_failure;
 
         pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE,
                                    (dma_addr_t *)&hwif->extra_base);
@@ -373,8 +372,8 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
                 return 0;
         }
 
-        pci_free_consistent(dev, IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
-                            hwif->dmatable_cpu, hwif->dmatable_dma);
+        ide_release_dma_engine(hwif);
+
         printk(KERN_ERR "%s(%s) -- ERROR: Unable to allocate DMA maps\n",
                __func__, hwif->name);
         printk(KERN_INFO "%s: changing from DMA to PIO mode", hwif->name);