parisc: convert to dma_map_ops

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Helge Deller <deller@gmx.de>
Acked-by: Helge Deller <deller@gmx.de>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 31 insertions, 26 deletions

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 8e11fb2831cd..e24b05996a1b 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -786,18 +786,27 @@ ccio_map_single(struct device *dev, void *addr, size_t size,
         return CCIO_IOVA(iovp, offset);
 }
 
+
+static dma_addr_t
+ccio_map_page(struct device *dev, struct page *page, unsigned long offset,
+                size_t size, enum dma_data_direction direction,
+                struct dma_attrs *attrs)
+{
+        return ccio_map_single(dev, page_address(page) + offset, size,
+                        direction);
+}
+
+
 /**
- * ccio_unmap_single - Unmap an address range from the IOMMU.
+ * ccio_unmap_page - Unmap an address range from the IOMMU.
  * @dev: The PCI device.
  * @addr: The start address of the DMA region.
  * @size: The length of the DMA region.
  * @direction: The direction of the DMA transaction (to/from device).
- *
- * This function implements the pci_unmap_single function.
  */
 static void 
-ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size, 
-                  enum dma_data_direction direction)
+ccio_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
+                enum dma_data_direction direction, struct dma_attrs *attrs)
 {
         struct ioc *ioc;
         unsigned long flags; 
@@ -826,7 +835,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
 }
 
 /**
- * ccio_alloc_consistent - Allocate a consistent DMA mapping.
+ * ccio_alloc - Allocate a consistent DMA mapping.
  * @dev: The PCI device.
  * @size: The length of the DMA region.
  * @dma_handle: The DMA address handed back to the device (not the cpu).
@@ -834,7 +843,8 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
  * This function implements the pci_alloc_consistent function.
  */
 static void * 
-ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)
+ccio_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag,
+                struct dma_attrs *attrs)
 {
       void *ret;
 #if 0
@@ -858,7 +868,7 @@ ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, g
 }
 
 /**
- * ccio_free_consistent - Free a consistent DMA mapping.
+ * ccio_free - Free a consistent DMA mapping.
  * @dev: The PCI device.
  * @size: The length of the DMA region.
  * @cpu_addr: The cpu address returned from the ccio_alloc_consistent.
@@ -867,10 +877,10 @@ ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, g
  * This function implements the pci_free_consistent function.
  */
 static void 
-ccio_free_consistent(struct device *dev, size_t size, void *cpu_addr, 
-                     dma_addr_t dma_handle)
+ccio_free(struct device *dev, size_t size, void *cpu_addr,
+                dma_addr_t dma_handle, struct dma_attrs *attrs)
 {
-        ccio_unmap_single(dev, dma_handle, size, 0);
+        ccio_unmap_page(dev, dma_handle, size, 0, NULL);
         free_pages((unsigned long)cpu_addr, get_order(size));
 }
 
@@ -897,7 +907,7 @@ ccio_free_consistent(struct device *dev, size_t size, void *cpu_addr,
  */
 static int
 ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents, 
-            enum dma_data_direction direction)
+            enum dma_data_direction direction, struct dma_attrs *attrs)
 {
         struct ioc *ioc;
         int coalesced, filled = 0;
@@ -974,7 +984,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
  */
 static void 
 ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, 
-              enum dma_data_direction direction)
+              enum dma_data_direction direction, struct dma_attrs *attrs)
 {
         struct ioc *ioc;
 
@@ -993,27 +1003,22 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
 #ifdef CCIO_COLLECT_STATS
                 ioc->usg_pages += sg_dma_len(sglist) >> PAGE_SHIFT;
 #endif
-                ccio_unmap_single(dev, sg_dma_address(sglist),
-                                  sg_dma_len(sglist), direction);
+                ccio_unmap_page(dev, sg_dma_address(sglist),
+                                  sg_dma_len(sglist), direction, NULL);
                 ++sglist;
         }
 
         DBG_RUN_SG("%s() DONE (nents %d)\n", __func__, nents);
 }
 
-static struct hppa_dma_ops ccio_ops = {
+static struct dma_map_ops ccio_ops = {
         .dma_supported =        ccio_dma_supported,
-        .alloc_consistent =     ccio_alloc_consistent,
-        .alloc_noncoherent =    ccio_alloc_consistent,
-        .free_consistent =      ccio_free_consistent,
-        .map_single =           ccio_map_single,
-        .unmap_single =         ccio_unmap_single,
+        .alloc =                ccio_alloc,
+        .free =                 ccio_free,
+        .map_page =             ccio_map_page,
+        .unmap_page =           ccio_unmap_page,
         .map_sg =               ccio_map_sg,
         .unmap_sg =             ccio_unmap_sg,
-        .dma_sync_single_for_cpu =      NULL,   /* NOP for U2/Uturn */
-        .dma_sync_single_for_device =   NULL,   /* NOP for U2/Uturn */
-        .dma_sync_sg_for_cpu =          NULL,   /* ditto */
-        .dma_sync_sg_for_device =               NULL,   /* ditto */
 };
 
 #ifdef CONFIG_PROC_FS
@@ -1062,7 +1067,7 @@ static int ccio_proc_info(struct seq_file *m, void *p)
                            ioc->msingle_calls, ioc->msingle_pages,
                            (int)((ioc->msingle_pages * 1000)/ioc->msingle_calls));
 
-                /* KLUGE - unmap_sg calls unmap_single for each mapped page */
+                /* KLUGE - unmap_sg calls unmap_page for each mapped page */
                 min = ioc->usingle_calls - ioc->usg_calls;
                 max = ioc->usingle_pages - ioc->usg_pages;
                 seq_printf(m, "pci_unmap_single: %8ld calls  %8ld pages (avg %d/1000)\n",