diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-08-27 15:49:10 +0100 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-11-07 21:52:47 +0800 |
| commit | 013b94e8e2a7bfb0c7e610e1d48df845552c34b6 (patch) | |
| tree | 43c029677a35b8243fa9185df740d4c80070108d /include | |
| parent | 8588e4727dc1a47cbac31710b81e6e82b490328c (diff) | |
dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops
set_arch_dma_coherent_ops is called from of_dma_configure in order to
swizzle the architectural dma-mapping functions over to a cache-coherent
implementation. This is currently implemented only for ARM.
In anticipation of re-using this mechanism for IOMMU-backed dma-mapping
ops too, this patch replaces the function with a broader
arch_setup_dma_ops callback which will be extended in future.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
(cherry picked from commit a3a60f81ee6f8fa65a57fa186b395bcd1f1bb097)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-mapping.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index d5d388160f42..8a1560f95d4a 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -129,11 +129,8 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) extern u64 dma_get_required_mask(struct device *dev); -#ifndef set_arch_dma_coherent_ops -static inline int set_arch_dma_coherent_ops(struct device *dev) -{ - return 0; -} +#ifndef arch_setup_dma_ops +static inline void arch_setup_dma_ops(struct device *dev, bool coherent) { } #endif static inline unsigned int dma_get_max_seg_size(struct device *dev) |