SPARC: adapt for dma_map_ops changes

Adapt core SPARC architecture code for dma_map_ops changes: replace
alloc/free_coherent with generic alloc/free methods.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 4 deletions

diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
index 4643d68713fa..070ed141aac7 100644
--- a/arch/sparc/kernel/iommu.c
+++ b/arch/sparc/kernel/iommu.c
@@ -280,7 +280,8 @@ static inline void iommu_free_ctx(struct iommu *iommu, int ctx)
 }
 
 static void *dma_4u_alloc_coherent(struct device *dev, size_t size,
-                                   dma_addr_t *dma_addrp, gfp_t gfp)
+                                   dma_addr_t *dma_addrp, gfp_t gfp,
+                                   struct dma_attrs *attrs)
 {
         unsigned long flags, order, first_page;
         struct iommu *iommu;
@@ -330,7 +331,8 @@ static void *dma_4u_alloc_coherent(struct device *dev, size_t size,
 }
 
 static void dma_4u_free_coherent(struct device *dev, size_t size,
-                                 void *cpu, dma_addr_t dvma)
+                                 void *cpu, dma_addr_t dvma,
+                                 struct dma_attrs *attrs)
 {
         struct iommu *iommu;
         unsigned long flags, order, npages;
@@ -825,8 +827,8 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
 }
 
 static struct dma_map_ops sun4u_dma_ops = {
-        .alloc_coherent         = dma_4u_alloc_coherent,
-        .free_coherent          = dma_4u_free_coherent,
+        .alloc                  = dma_4u_alloc_coherent,
+        .free                   = dma_4u_free_coherent,
         .map_page               = dma_4u_map_page,
         .unmap_page             = dma_4u_unmap_page,
         .map_sg                 = dma_4u_map_sg,