diff options
| author | Masahiro Yamada | 2020-02-14 16:40:17 +0900 |
|---|---|---|
| committer | Peng Fan | 2020-02-19 21:27:30 +0800 |
| commit | c22c0dbd7d3bb7ce47779b757d567d2e7746744b (patch) | |
| tree | 79b6c1d854653d19f868268a424e463d60ee6400 | |
| parent | ede2822864c3145859372f4ad1b82f4c98584128 (diff) | |
dma-mapping: fix the prototype of dma_map_single()
Make dma_map_single() return the dma address, and remove the
pointless volatile.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 5 | ||||
| -rw-r--r-- | arch/nds32/include/asm/dma-mapping.h | 5 | ||||
| -rw-r--r-- | arch/riscv/include/asm/dma-mapping.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/dma-mapping.h | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index d20703739fa..d0895a20966 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -11,6 +11,7 @@ #include <asm/cache.h> #include <cpu_func.h> #include <linux/dma-direction.h> +#include <linux/types.h> #include <malloc.h> #define dma_mapping_error(x, y) 0 @@ -26,8 +27,8 @@ static inline void dma_free_coherent(void *addr) free(addr); } -static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, - enum dma_data_direction dir) +static inline dma_addr_t dma_map_single(void *vaddr, size_t len, + enum dma_data_direction dir) { unsigned long addr = (unsigned long)vaddr; diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h index c8876ceadda..9387dec3476 100644 --- a/arch/nds32/include/asm/dma-mapping.h +++ b/arch/nds32/include/asm/dma-mapping.h @@ -10,6 +10,7 @@ #include <asm/cache.h> #include <cpu_func.h> #include <linux/dma-direction.h> +#include <linux/types.h> #include <malloc.h> static void *dma_alloc_coherent(size_t len, unsigned long *handle) @@ -18,8 +19,8 @@ static void *dma_alloc_coherent(size_t len, unsigned long *handle) return (void *)*handle; } -static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, - enum dma_data_direction dir) +static inline dma_addr_t dma_map_single(void *vaddr, size_t len, + enum dma_data_direction dir) { unsigned long addr = (unsigned long)vaddr; diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h index 6cc39469590..eac56f8fbdf 100644 --- a/arch/riscv/include/asm/dma-mapping.h +++ b/arch/riscv/include/asm/dma-mapping.h @@ -10,6 +10,7 @@ #define __ASM_RISCV_DMA_MAPPING_H #include <common.h> +#include <linux/types.h> #include <asm/cache.h> #include <cpu_func.h> #include <linux/dma-direction.h> @@ -28,8 +29,8 @@ static inline void dma_free_coherent(void *addr) free(addr); } -static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, - enum dma_data_direction dir) +static inline dma_addr_t dma_map_single(void *vaddr, size_t len, + enum dma_data_direction dir) { unsigned long addr = (unsigned long)vaddr; diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 900b99b8a69..7e205e3313a 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -11,6 +11,7 @@ #include <asm/cache.h> #include <cpu_func.h> #include <linux/dma-direction.h> +#include <linux/types.h> #include <malloc.h> #define dma_mapping_error(x, y) 0 @@ -26,8 +27,8 @@ static inline void dma_free_coherent(void *addr) free(addr); } -static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, - enum dma_data_direction dir) +static inline dma_addr_t dma_map_single(void *vaddr, size_t len, + enum dma_data_direction dir) { unsigned long addr = (unsigned long)vaddr; |