summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/mach-ip32
diff options
context:
space:
mode:
authorDavid Daney <ddaney@caviumnetworks.com>2010-10-01 22:27:32 +0200
committerRalf Baechle <ralf@linux-mips.org>2010-10-29 20:08:31 +0200
commit48e1fd5a81416a037f5a48120bf281102f2584e2 (patch)
treec5c4bd344f50493bb1d1c36d485300e9061c5aa2 /arch/mips/include/asm/mach-ip32
parentMIPS: ip32, ip27, jazz: Make static functions in dma-coherence.h inline. (diff)
downloadlinux-48e1fd5a81416a037f5a48120bf281102f2584e2.tar.xz
linux-48e1fd5a81416a037f5a48120bf281102f2584e2.zip
MIPS: Convert DMA to use dma-mapping-common.h
Use asm-generic/dma-mapping-common.h to handle all DMA mapping operations and establish a default get_dma_ops() that forwards all operations to the existing code. Augment dev_archdata to carry a pointer to the struct dma_map_ops, allowing DMA operations to be overridden on a per device basis. Currently this is never filled in, so the default dma_map_ops are used. A follow-on patch sets this for Octeon PCI devices. Also initialize the dma_debug system as it is now used if it is configured. Includes fixes by Kevin Cernekee <cernekee@gmail.com>. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Patchwork: http://patchwork.linux-mips.org/patch/1637/ Patchwork: http://patchwork.linux-mips.org/patch/1678/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm/mach-ip32')
-rw-r--r--arch/mips/include/asm/mach-ip32/dma-coherence.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h
index 55123fc0b2f0..c8fb5aacf50a 100644
--- a/arch/mips/include/asm/mach-ip32/dma-coherence.h
+++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h
@@ -37,7 +37,8 @@ static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr,
return pa;
}
-static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
+static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
+ struct page *page)
{
dma_addr_t pa;