Patched in Tegra support.

1 files changed, 6 insertions, 14 deletions

diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index 006b43e38a9..7aa37ddfca4 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -40,8 +40,6 @@ static inline int dma_supported(struct device *dev, u64 mask)
 static inline int dma_mapping_error(struct device *dev, u64 mask)
 {
         struct dma_map_ops *ops = get_dma_ops(dev);
-
-        debug_dma_mapping_error(dev, mask);
         return ops->mapping_error(dev, mask);
 }
 
@@ -59,31 +57,25 @@ dma_set_mask(struct device *dev, u64 mask)
 extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction);
 
-#define dma_alloc_coherent(d,s,h,f)     dma_alloc_attrs(d,s,h,f,NULL)
-
-static inline void *dma_alloc_attrs(struct device *dev, size_t size,
-                                    dma_addr_t *dma_handle, gfp_t gfp,
-                                    struct dma_attrs *attrs)
+static inline void *dma_alloc_coherent(struct device *dev, size_t size,
+                                       dma_addr_t *dma_handle, gfp_t gfp)
 {
         void *ret;
         struct dma_map_ops *ops = get_dma_ops(dev);
 
-        ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
+        ret = ops->alloc_coherent(dev, size, dma_handle, gfp);
 
         debug_dma_alloc_coherent(dev, size, *dma_handle, ret);
 
         return ret;
 }
 
-#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
-
-static inline void dma_free_attrs(struct device *dev, size_t size,
-                                  void *vaddr, dma_addr_t dma_handle,
-                                  struct dma_attrs *attrs)
+static inline void dma_free_coherent(struct device *dev, size_t size,
+                                     void *vaddr, dma_addr_t dma_handle)
 {
         struct dma_map_ops *ops = get_dma_ops(dev);
 
-        ops->free(dev, size, vaddr, dma_handle, attrs);
+        ops->free_coherent(dev, size, vaddr, dma_handle);
 
         debug_dma_free_coherent(dev, size, vaddr, dma_handle);
 }