aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sh
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-10-17 02:29:42 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:57 -0400
commit622a9edd919de98ef59571ae6c40c7458244e3f2 (patch)
treec25684f90ed52c459c39d97d6ab641fe3bb6b09d /include/asm-sh
parentbc154b1efb7f8430ea9faabd5953ebc411f8ead5 (diff)
Remove dma_cache_(wback|inv|wback_inv) functions
dma_cache_(wback|inv|wback_inv) were the earliest attempt on a generalized cache managment API for I/O purposes. Originally it was basically the raw MIPS low level cache API exported to the entire world. The API has suffered from a lack of documentation, was not very widely used unlike it's more modern brothers and can easily be replaced by dma_cache_sync. So remove it rsp. turn the surviving bits back into an arch private API, as discussed on linux-arch. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Paul Mackerras <paulus@samba.org> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Kyle McMartin <kyle@parisc-linux.org> Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-sh')
-rw-r--r--include/asm-sh/floppy.h2
-rw-r--r--include/asm-sh/io.h25
2 files changed, 1 insertions, 26 deletions
diff --git a/include/asm-sh/floppy.h b/include/asm-sh/floppy.h
index 942ade98757b..59fbfdc90dfb 100644
--- a/include/asm-sh/floppy.h
+++ b/include/asm-sh/floppy.h
@@ -213,7 +213,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
213 } 213 }
214#endif 214#endif
215 215
216 dma_cache_wback_inv(addr, size); 216 __flush_purge_region(addr, size);
217 217
218 /* actual, physical DMA */ 218 /* actual, physical DMA */
219 doing_pdma = 0; 219 doing_pdma = 0;
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index 1a336cdc75fe..6ed34d8eac5f 100644
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -327,31 +327,6 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
327 __iounmap((addr)) 327 __iounmap((addr))
328 328
329/* 329/*
330 * The caches on some architectures aren't dma-coherent and have need to
331 * handle this in software. There are three types of operations that
332 * can be applied to dma buffers.
333 *
334 * - dma_cache_wback_inv(start, size) makes caches and RAM coherent by
335 * writing the content of the caches back to memory, if necessary.
336 * The function also invalidates the affected part of the caches as
337 * necessary before DMA transfers from outside to memory.
338 * - dma_cache_inv(start, size) invalidates the affected parts of the
339 * caches. Dirty lines of the caches may be written back or simply
340 * be discarded. This operation is necessary before dma operations
341 * to the memory.
342 * - dma_cache_wback(start, size) writes back any dirty lines but does
343 * not invalidate the cache. This can be used before DMA reads from
344 * memory,
345 */
346
347#define dma_cache_wback_inv(_start,_size) \
348 __flush_purge_region(_start,_size)
349#define dma_cache_inv(_start,_size) \
350 __flush_invalidate_region(_start,_size)
351#define dma_cache_wback(_start,_size) \
352 __flush_wback_region(_start,_size)
353
354/*
355 * Convert a physical pointer to a virtual kernel pointer for /dev/mem 330 * Convert a physical pointer to a virtual kernel pointer for /dev/mem
356 * access 331 * access
357 */ 332 */