aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMasahiro Yamada2020-02-14 16:40:17 +0900
committerPeng Fan2020-02-19 21:27:30 +0800
commitc22c0dbd7d3bb7ce47779b757d567d2e7746744b (patch)
tree79b6c1d854653d19f868268a424e463d60ee6400 /arch/arm
parentede2822864c3145859372f4ad1b82f4c98584128 (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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/dma-mapping.h5
1 files changed, 3 insertions, 2 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;