aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-04-16 17:26:38 +0200
committerChristoph Hellwig <hch@lst.de>2018-08-02 13:54:01 +0200
commitb2fcb677d4dd2aac3202365719733452b5512719 (patch)
tree91071d203e84bd90a370e64c5f50e496d353ce61 /arch/sh/include
parentOF: Don't set default coherent DMA mask (diff)
downloadlinux-dev-b2fcb677d4dd2aac3202365719733452b5512719.tar.xz
linux-dev-b2fcb677d4dd2aac3202365719733452b5512719.zip
sh: simplify get_arch_dma_ops
Remove the indirection through the dma_ops variable, and just return nommu_dma_ops directly from get_arch_dma_ops. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Diffstat (limited to 'arch/sh/include')
-rw-r--r--arch/sh/include/asm/dma-mapping.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h
index 41167931e5d9..149e71f95be7 100644
--- a/arch/sh/include/asm/dma-mapping.h
+++ b/arch/sh/include/asm/dma-mapping.h
@@ -2,12 +2,11 @@
#ifndef __ASM_SH_DMA_MAPPING_H
#define __ASM_SH_DMA_MAPPING_H
-extern const struct dma_map_ops *dma_ops;
-extern void no_iommu_init(void);
+extern const struct dma_map_ops nommu_dma_ops;
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
- return dma_ops;
+ return &nommu_dma_ops;
}
extern void *dma_generic_alloc_coherent(struct device *dev, size_t size,