diff options
| author | Magnus Damm <damm@igel.co.jp> | 2008-10-09 18:43:57 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 11:38:44 +0900 |
| commit | 7713718751aa8b8df39314b7e49ea2f66a5d1f0c (patch) | |
| tree | a3baa30c9f99ec86352264857fcb19509708ac8c /arch/sh | |
| parent | 4aeaa223433355a281559033f1e7600bfd73238e (diff) | |
| download | kernel_samsung_espresso10-7713718751aa8b8df39314b7e49ea2f66a5d1f0c.zip kernel_samsung_espresso10-7713718751aa8b8df39314b7e49ea2f66a5d1f0c.tar.gz kernel_samsung_espresso10-7713718751aa8b8df39314b7e49ea2f66a5d1f0c.tar.bz2 | |
sh: remove consistent alloc cruft
Remove left overs from the generic declared coherent rework.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/mm/consistent.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c index 7619a0f..9f8ea3a 100644 --- a/arch/sh/mm/consistent.c +++ b/arch/sh/mm/consistent.c @@ -16,14 +16,6 @@ #include <asm/addrspace.h> #include <asm/io.h> -struct dma_coherent_mem { - void *virt_base; - u32 device_base; - int size; - int flags; - unsigned long *bitmap; -}; - void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) { @@ -58,12 +50,10 @@ EXPORT_SYMBOL(dma_alloc_coherent); void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) { - struct dma_coherent_mem *mem = dev ? dev->dma_mem : NULL; int order = get_order(size); if (!dma_release_from_coherent(dev, order, vaddr)) { WARN_ON(irqs_disabled()); /* for portability */ - BUG_ON(mem && mem->flags & DMA_MEMORY_EXCLUSIVE); free_pages((unsigned long)phys_to_virt(dma_handle), order); iounmap(vaddr); } |