1 files changed, 19 insertions, 24 deletions

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 70be6e106667..b50fa578df81 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -622,7 +622,7 @@ void ___dma_page_dev_to_cpu(struct page *page, unsigned long off,
 EXPORT_SYMBOL(___dma_page_dev_to_cpu);
 
 /**
- * dma_map_sg - map a set of SG buffers for streaming mode DMA
+ * arm_dma_map_sg - map a set of SG buffers for streaming mode DMA
  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
  * @sg: list of buffers
  * @nents: number of buffers to map
@@ -640,12 +640,13 @@ EXPORT_SYMBOL(___dma_page_dev_to_cpu);
 int arm_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
                 enum dma_data_direction dir, struct dma_attrs *attrs)
 {
+        struct dma_map_ops *ops = get_dma_ops(dev);
         struct scatterlist *s;
         int i, j;
 
         for_each_sg(sg, s, nents, i) {
-                s->dma_address = __dma_map_page(dev, sg_page(s), s->offset,
-                                                s->length, dir);
+                s->dma_address = ops->map_page(dev, sg_page(s), s->offset,
+                                                s->length, dir, attrs);
                 if (dma_mapping_error(dev, s->dma_address))
                         goto bad_mapping;
         }
@@ -653,12 +654,12 @@ int arm_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 
  bad_mapping:
         for_each_sg(sg, s, i, j)
-                __dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir);
+                ops->unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir, attrs);
         return 0;
 }
 
 /**
- * dma_unmap_sg - unmap a set of SG buffers mapped by dma_map_sg
+ * arm_dma_unmap_sg - unmap a set of SG buffers mapped by dma_map_sg
  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
  * @sg: list of buffers
  * @nents: number of buffers to unmap (same as was passed to dma_map_sg)
@@ -670,15 +671,17 @@ int arm_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 void arm_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
                 enum dma_data_direction dir, struct dma_attrs *attrs)
 {
+        struct dma_map_ops *ops = get_dma_ops(dev);
         struct scatterlist *s;
+
         int i;
 
         for_each_sg(sg, s, nents, i)
-                __dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir);
+                ops->unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir, attrs);
 }
 
 /**
- * dma_sync_sg_for_cpu
+ * arm_dma_sync_sg_for_cpu
  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
  * @sg: list of buffers
  * @nents: number of buffers to map (returned from dma_map_sg)
@@ -687,21 +690,17 @@ void arm_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
 void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
                         int nents, enum dma_data_direction dir)
 {
+        struct dma_map_ops *ops = get_dma_ops(dev);
         struct scatterlist *s;
         int i;
 
-        for_each_sg(sg, s, nents, i) {
-                if (!dmabounce_sync_for_cpu(dev, sg_dma_address(s),
-                                            sg_dma_len(s), dir))
-                        continue;
-
-                __dma_page_dev_to_cpu(sg_page(s), s->offset,
-                                      s->length, dir);
-        }
+        for_each_sg(sg, s, nents, i)
+                ops->sync_single_for_cpu(dev, sg_dma_address(s), s->length,
+                                         dir);
 }
 
 /**
- * dma_sync_sg_for_device
+ * arm_dma_sync_sg_for_device
  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
  * @sg: list of buffers
  * @nents: number of buffers to map (returned from dma_map_sg)
@@ -710,17 +709,13 @@ void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
 void arm_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
                         int nents, enum dma_data_direction dir)
 {
+        struct dma_map_ops *ops = get_dma_ops(dev);
         struct scatterlist *s;
         int i;
 
-        for_each_sg(sg, s, nents, i) {
-                if (!dmabounce_sync_for_device(dev, sg_dma_address(s),
-                                        sg_dma_len(s), dir))
-                        continue;
-
-                __dma_page_cpu_to_dev(sg_page(s), s->offset,
-                                      s->length, dir);
-        }
+        for_each_sg(sg, s, nents, i)
+                ops->sync_single_for_device(dev, sg_dma_address(s), s->length,
+                                            dir);
 }
 
 /*