2 files changed, 5 insertions, 49 deletions

diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h
index de4309960207..e661857f98dc 100644
--- a/include/asm-sh64/dma-mapping.h
+++ b/include/asm-sh64/dma-mapping.h
@@ -42,7 +42,11 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
 static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                                   enum dma_data_direction dir)
 {
-        dma_cache_wback_inv((unsigned long)vaddr, size);
+        unsigned long s = (unsigned long) vaddr & L1_CACHE_ALIGN_MASK;
+        unsigned long e = (vaddr + size) & L1_CACHE_ALIGN_MASK;
+
+        for (; s <= e; s += L1_CACHE_BYTES)
+                asm volatile ("ocbp     %0, 0" : : "r" (s));
 }
 
 static inline dma_addr_t dma_map_single(struct device *dev,
diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h
index 3de3ad99f457..7bd7314d38c2 100644
--- a/include/asm-sh64/io.h
+++ b/include/asm-sh64/io.h
@@ -182,54 +182,6 @@ unsigned long onchip_remap(unsigned long addr, unsigned long size, const char* n
 extern void onchip_unmap(unsigned long vaddr);
 
 /*
- * The caches on some architectures aren't dma-coherent and have need to
- * handle this in software.  There are three types of operations that
- * can be applied to dma buffers.
- *
- *  - dma_cache_wback_inv(start, size) makes caches and RAM coherent by
- *    writing the content of the caches back to memory, if necessary.
- *    The function also invalidates the affected part of the caches as
- *    necessary before DMA transfers from outside to memory.
- *  - dma_cache_inv(start, size) invalidates the affected parts of the
- *    caches.  Dirty lines of the caches may be written back or simply
- *    be discarded.  This operation is necessary before dma operations
- *    to the memory.
- *  - dma_cache_wback(start, size) writes back any dirty lines but does
- *    not invalidate the cache.  This can be used before DMA reads from
- *    memory,
- */
-
-static __inline__ void dma_cache_wback_inv (unsigned long start, unsigned long size)
-{
-        unsigned long s = start & L1_CACHE_ALIGN_MASK;
-        unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;
-
-        for (; s <= e; s += L1_CACHE_BYTES)
-                asm volatile ("ocbp     %0, 0" : : "r" (s));
-}
-
-static __inline__ void dma_cache_inv (unsigned long start, unsigned long size)
-{
-        // Note that caller has to be careful with overzealous
-        // invalidation should there be partial cache lines at the extremities
-        // of the specified range
-        unsigned long s = start & L1_CACHE_ALIGN_MASK;
-        unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;
-
-        for (; s <= e; s += L1_CACHE_BYTES)
-                asm volatile ("ocbi     %0, 0" : : "r" (s));
-}
-
-static __inline__ void dma_cache_wback (unsigned long start, unsigned long size)
-{
-        unsigned long s = start & L1_CACHE_ALIGN_MASK;
-        unsigned long e = (start + size) & L1_CACHE_ALIGN_MASK;
-
-        for (; s <= e; s += L1_CACHE_BYTES)
-                asm volatile ("ocbwb    %0, 0" : : "r" (s));
-}
-
-/*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
  * access
  */