diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-08-10 21:03:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-11 11:59:21 -0400 |
commit | 4565f0170dfc849b3629c27d769db800467baa62 (patch) | |
tree | a2c70fb6f2f4826749b704ed83557623ca95bca5 /arch/sh | |
parent | a6eb9fe105d5de0053b261148cee56c94b4720ca (diff) |
dma-mapping: unify dma_get_cache_alignment implementations
dma_get_cache_alignment returns the minimum DMA alignment. Architectures
defines it as ARCH_DMA_MINALIGN (formally ARCH_KMALLOC_MINALIGN). So we
can unify dma_get_cache_alignment implementations.
Note that some architectures implement dma_get_cache_alignment wrongly.
dma_get_cache_alignment() should return the minimum DMA alignment. So
fully-coherent architectures should return 1. This patch also fixes this
issue.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
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 'arch/sh')
-rw-r--r-- | arch/sh/include/asm/dma-mapping.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h index bea3337a426a..6bb5cc9decf8 100644 --- a/arch/sh/include/asm/dma-mapping.h +++ b/arch/sh/include/asm/dma-mapping.h | |||
@@ -48,15 +48,6 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, | |||
48 | #define dma_is_consistent(d, h) (0) | 48 | #define dma_is_consistent(d, h) (0) |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | static inline int dma_get_cache_alignment(void) | ||
52 | { | ||
53 | /* | ||
54 | * Each processor family will define its own L1_CACHE_SHIFT, | ||
55 | * L1_CACHE_BYTES wraps to this, so this is always safe. | ||
56 | */ | ||
57 | return L1_CACHE_BYTES; | ||
58 | } | ||
59 | |||
60 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | 51 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) |
61 | { | 52 | { |
62 | struct dma_map_ops *ops = get_dma_ops(dev); | 53 | struct dma_map_ops *ops = get_dma_ops(dev); |