Messages in this thread Patch in this message | | | From | Sudip Mukherjee <> | Subject | [PATCH 2/4] xtensa: fix error with dma_supported | Date | Tue, 8 Sep 2015 18:48:32 +0530 |
| |
commit 11bd9421d0ad ("dma-mapping: cosolidate dma_mapping_error") has removed dma_mapping_error() from arch specific file to asm-generic/dma-mapping-common.h but it was not removed from xtensa architecture and as a result we were getting error like: error: redefinition of 'dma_mapping_error' while building with allmodconfig.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- arch/xtensa/include/asm/dma-mapping.h | 9 --------- 1 file changed, 9 deletions(-)
diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h index bf24c90..5762d8d 100644 --- a/arch/xtensa/include/asm/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h @@ -36,15 +36,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) #define dma_free_noncoherent(d, s, v, h) dma_free_attrs(d, s, v, h, NULL) static inline int -dma_mapping_error(struct device *dev, dma_addr_t dma_addr) -{ - struct dma_map_ops *ops = get_dma_ops(dev); - - debug_dma_mapping_error(dev, dma_addr); - return ops->mapping_error(dev, dma_addr); -} - -static inline int dma_supported(struct device *dev, u64 mask) { return 1; -- 1.9.1
| |