diff options
| author |   Catalin Marinas <catalin.marinas@arm.com> | 2015-01-12 20:48:53 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-01-23 16:43:55 +0000 |
| commit | 9d3bfbb4df58a8025b46b2676da2cf450385b754 (patch) | |
| tree | 432bc59dd87567bdf67f269a2dc31d9d550aed8c /arch/arm64/include/asm/dma-mapping.h | |
| parent | arm64: Fix SCTLR_EL1 initialisation (diff) | |
| download | linux-dev-9d3bfbb4df58a8025b46b2676da2cf450385b754.tar.xz linux-dev-9d3bfbb4df58a8025b46b2676da2cf450385b754.zip | |
arm64: Combine coherent and non-coherent swiotlb dma_ops
Since dev_archdata now has a dma_coherent state, combine the two
coherent and non-coherent operations and remove their declaration,
together with set_dma_ops, from the arch dma-mapping.h file.
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/arm64/include/asm/dma-mapping.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index 9ce3e680ae1c..6932bb57dba0 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -28,8 +28,6 @@ #define DMA_ERROR_CODE (~(dma_addr_t)0) extern struct dma_map_ops *dma_ops; -extern struct dma_map_ops coherent_swiotlb_dma_ops; -extern struct dma_map_ops noncoherent_swiotlb_dma_ops; static inline struct dma_map_ops *__generic_dma_ops(struct device *dev) { @@ -47,23 +45,18 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) return __generic_dma_ops(dev); } -static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) -{ - dev->archdata.dma_ops = ops; -} - static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, struct iommu_ops *iommu, bool coherent) { dev->archdata.dma_coherent = coherent; - if (coherent) - set_dma_ops(dev, &coherent_swiotlb_dma_ops); } #define arch_setup_dma_ops arch_setup_dma_ops /* do not use this function in a driver */ static inline bool is_device_dma_coherent(struct device *dev) { + if (!dev) + return false; return dev->archdata.dma_coherent; } |