diff options
author | Lucas Stach <dev@lynxeye.de> | 2015-03-05 22:49:53 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-06 07:51:47 +0100 |
commit | 394a3533a8c66400aeeddf69c5c2c45fb598a946 (patch) | |
tree | 58ba8373ef230882cb4cf44c3625ea4330d49209 /arch/nios2 | |
parent | f61fa09a42e6f936d55c5745f2001bd9b5d20c10 (diff) | |
download | barebox-394a3533a8c66400aeeddf69c5c2c45fb598a946.tar.gz barebox-394a3533a8c66400aeeddf69c5c2c45fb598a946.tar.xz |
NIOS2: use dma_addr_t in dma_alloc_coherent
This allows to consolidate the prototype of this function across
architectures. Also guard against calles that pass in NULL as the
dma handle pointer.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/nios2')
-rw-r--r-- | arch/nios2/include/asm/dma-mapping.h | 13 | ||||
-rw-r--r-- | arch/nios2/include/asm/types.h | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h index 620c207a03..5ecc1ed21e 100644 --- a/arch/nios2/include/asm/dma-mapping.h +++ b/arch/nios2/include/asm/dma-mapping.h @@ -14,24 +14,25 @@ */ #if (DCACHE_SIZE != 0) -static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) +static inline void *dma_alloc_coherent(size_t len, dma_addr_t *handle) { void *addr = malloc(len + DCACHE_LINE_SIZE); if (!addr) return 0; flush_dcache_range((unsigned long)addr,(unsigned long)addr + len + DCACHE_LINE_SIZE); - *handle = ((unsigned long)addr + - (DCACHE_LINE_SIZE - 1)) & - ~(DCACHE_LINE_SIZE - 1) & ~(IO_REGION_BASE); + if (handle) + *handle = ((dma_addr_t)addr + (DCACHE_LINE_SIZE - 1)) & + ~(DCACHE_LINE_SIZE - 1) & ~(IO_REGION_BASE); return (void *)(*handle | IO_REGION_BASE); } #else -static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) +static inline void *dma_alloc_coherent(size_t len, dma_addr_t *handle) { void *addr = malloc(len); if (!addr) return 0; - *handle = (unsigned long)addr; + if (handle) + *handle = (dma_addr_t)addr; return (void *)(*handle | IO_REGION_BASE); } #endif diff --git a/arch/nios2/include/asm/types.h b/arch/nios2/include/asm/types.h index 1f613d1cb9..21c3415f93 100644 --- a/arch/nios2/include/asm/types.h +++ b/arch/nios2/include/asm/types.h @@ -3,5 +3,7 @@ #include <asm/int-ll64.h> +typedef u32 dma_addr_t; + #endif |