diff options
| author | Masahiro Yamada <[email protected]> | 2017-08-26 00:50:17 +0900 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-09-12 18:02:23 -0400 |
| commit | b27af39935855c88ef2203dcfc1ff54e013237c4 (patch) | |
| tree | 741e0eb177bf5dab0e50cc99b4c6a5983ef07fbb /arch | |
| parent | 29487ef4d5d720012658cb7a093af742f8ae2af5 (diff) | |
dma: import linux/dma-direction.h to consolidate enum dma_data_direction
Import include/linux/dma-direction.h from Linux 4.13-rc7 and delete
duplicated definitions of enum dma_data_direction.
Signed-off-by: Masahiro Yamada <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 8 | ||||
| -rw-r--r-- | arch/nds32/include/asm/dma-mapping.h | 6 | ||||
| -rw-r--r-- | arch/x86/include/asm/dma-mapping.h | 8 |
3 files changed, 5 insertions, 17 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index a5821f54e56..287466800e4 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -8,13 +8,9 @@ #ifndef __ASM_ARM_DMA_MAPPING_H #define __ASM_ARM_DMA_MAPPING_H -#define dma_mapping_error(x, y) 0 +#include <linux/dma-direction.h> -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, -}; +#define dma_mapping_error(x, y) 0 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) { diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h index 25e5a1b6ec8..a627306ed85 100644 --- a/arch/nds32/include/asm/dma-mapping.h +++ b/arch/nds32/include/asm/dma-mapping.h @@ -7,11 +7,7 @@ #ifndef __ASM_NDS_DMA_MAPPING_H #define __ASM_NDS_DMA_MAPPING_H -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, -}; +#include <linux/dma-direction.h> static void *dma_alloc_coherent(size_t len, unsigned long *handle) { diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 7de4c08e36e..43073ad2524 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -8,13 +8,9 @@ #ifndef __ASM_X86_DMA_MAPPING_H #define __ASM_X86_DMA_MAPPING_H -#define dma_mapping_error(x, y) 0 +#include <linux/dma-direction.h> -enum dma_data_direction { - DMA_BIDIRECTIONAL = 0, - DMA_TO_DEVICE = 1, - DMA_FROM_DEVICE = 2, -}; +#define dma_mapping_error(x, y) 0 static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) { |