Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

[mv-sheeva.git] / include / asm-generic / dma-mapping-common.h

diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
index 69206957b72c52efe1f9fe7d2479cfc931d7d7b7..0c80bb38773f142ef829dcbc190c60f2cf6ccff8 100644 (file)
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
@@ -123,15 +123,7 @@ static inline void dma_sync_single_range_for_cpu(struct device *dev,
                                                 size_t size,
                                                 enum dma_data_direction dir)
 {
-       struct dma_map_ops *ops = get_dma_ops(dev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->sync_single_range_for_cpu) {
-               ops->sync_single_range_for_cpu(dev, addr, offset, size, dir);
-               debug_dma_sync_single_range_for_cpu(dev, addr, offset, size, dir);
-
-       } else
-               dma_sync_single_for_cpu(dev, addr + offset, size, dir);
+       dma_sync_single_for_cpu(dev, addr + offset, size, dir);
 }
 
 static inline void dma_sync_single_range_for_device(struct device *dev,
@@ -140,15 +132,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev,
                                                    size_t size,
                                                    enum dma_data_direction dir)
 {
-       struct dma_map_ops *ops = get_dma_ops(dev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->sync_single_range_for_device) {
-               ops->sync_single_range_for_device(dev, addr, offset, size, dir);
-               debug_dma_sync_single_range_for_device(dev, addr, offset, size, dir);
-
-       } else
-               dma_sync_single_for_device(dev, addr + offset, size, dir);
+       dma_sync_single_for_device(dev, addr + offset, size, dir);
 }
 
 static inline void