aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-08-24 03:47:20 -0400
committerChristoph Hellwig <hch@lst.de>2018-09-08 05:19:10 -0400
commit58643a3a8097e93b1c965d0ad3f0d65613b95b2c (patch)
treebaa7de294980a1d6ee8c8915f7c41176c65cb149
parente0a9317d900426233621fd88d7ef2ce83c9987aa (diff)
arm-nommu: don't define arch_teardown_dma_ops
We can just use the default implementation. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-rw-r--r--arch/arm/include/asm/dma-mapping.h2
-rw-r--r--arch/arm/mm/dma-mapping-nommu.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 8436f6ade57d..965b7c846ecb 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -100,8 +100,10 @@ static inline unsigned long dma_max_pfn(struct device *dev)
100extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, 100extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
101 const struct iommu_ops *iommu, bool coherent); 101 const struct iommu_ops *iommu, bool coherent);
102 102
103#ifdef CONFIG_MMU
103#define arch_teardown_dma_ops arch_teardown_dma_ops 104#define arch_teardown_dma_ops arch_teardown_dma_ops
104extern void arch_teardown_dma_ops(struct device *dev); 105extern void arch_teardown_dma_ops(struct device *dev);
106#endif
105 107
106/* do not use this function in a driver */ 108/* do not use this function in a driver */
107static inline bool is_device_dma_coherent(struct device *dev) 109static inline bool is_device_dma_coherent(struct device *dev)
diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c
index f448a0663b10..aa7aba302e76 100644
--- a/arch/arm/mm/dma-mapping-nommu.c
+++ b/arch/arm/mm/dma-mapping-nommu.c
@@ -237,7 +237,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
237 237
238 set_dma_ops(dev, dma_ops); 238 set_dma_ops(dev, dma_ops);
239} 239}
240
241void arch_teardown_dma_ops(struct device *dev)
242{
243}