From 394a3533a8c66400aeeddf69c5c2c45fb598a946 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Thu, 5 Mar 2015 22:49:53 +0100 Subject: [PATCH] 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 Signed-off-by: Sascha Hauer --- arch/nios2/include/asm/dma-mapping.h | 13 +++++++------ arch/nios2/include/asm/types.h | 2 ++ drivers/net/altera_tse.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h index 620c207a0..5ecc1ed21 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 1f613d1cb..21c3415f9 100644 --- a/arch/nios2/include/asm/types.h +++ b/arch/nios2/include/asm/types.h @@ -3,5 +3,7 @@ #include +typedef u32 dma_addr_t; + #endif diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index ecbb9f897..3c49c0945 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -520,7 +520,7 @@ static int tse_probe(struct device_d *dev) return PTR_ERR(tx_desc); rx_desc = tx_desc + 2; #else - tx_desc = dma_alloc_coherent(sizeof(*tx_desc) * (3 + PKTBUFSRX), (unsigned long *)&dma_handle); + tx_desc = dma_alloc_coherent(sizeof(*tx_desc) * (3 + PKTBUFSRX), (dma_addr_t *)&dma_handle); rx_desc = tx_desc + 2; if (!tx_desc) {