Messages in this thread Patch in this message | | | From | Sudip Mukherjee <> | Subject | [PATCH 4/4] xtensa: fix error with dma_set_mask | Date | Tue, 8 Sep 2015 18:48:34 +0530 |
| |
commit 13bad70fb5ba ("dma-mapping: consolidate dma_set_mask") has removed dma_set_mask() from individual arch files to asm-generic/dma-mapping-common.h. But it was not removed for xtensa architecture and as a result we were getting errors like: error: redefinition of 'dma_set_mask' while building with allmodconfig.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- arch/xtensa/include/asm/dma-mapping.h | 11 ----------- 1 file changed, 11 deletions(-)
diff --git a/arch/xtensa/include/asm/dma-mapping.h b/arch/xtensa/include/asm/dma-mapping.h index 019a94a..15992a3 100644 --- a/arch/xtensa/include/asm/dma-mapping.h +++ b/arch/xtensa/include/asm/dma-mapping.h @@ -43,17 +43,6 @@ dma_supported(struct device *dev, u64 mask) #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL) #define dma_free_noncoherent(d, s, v, h) dma_free_attrs(d, s, v, h, NULL) -static inline int -dma_set_mask(struct device *dev, u64 mask) -{ - if(!dev->dma_mask || !dma_supported(dev, mask)) - return -EIO; - - *dev->dma_mask = mask; - - return 0; -} - void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction); -- 1.9.1
| |