ide: switch to DMA-mapping API part #2

Follow-up to commit 5c05ff68b9a9b40a9be949497e0aa980185565cf
("ide: switch to DMA-mapping API"):

* pci_{alloc,free}_consistent() -> dma_{alloc,free}_coherent()
  in ide_{allocate,release}_dma_engine().

* Add ->prd_max_nents and ->prd_ent_size fields to ide_hwif_t
  (+ set default values in ide_allocate_dma_engine()).

* Make ide_{allocate,release}_dma_engine() available also
  for CONFIG_BLK_DEV_IDEDMA_SFF=n.  Then convert au1xxx-ide.c,
  scc_pata.c and sgiioc4.c to use them.

* Add missing ->init_dma method to scc_pata.

This patch also fixes:
- ->dmatable_cpu leak for au1xxx-ide
- too early realease of ->dmatable_cpu for scc_pata
- wrong amount of ->dmatable_cpu memory being freed for sgiioc4

While at it:
- remove superfluous ->dma_base check from ide_unregister()
- return -ENOMEM on error in ide_release_dma_engine()
- beautify error message in ide_release_dma_engine()

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 7 insertions, 8 deletions

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);