summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2022-06-14 11:15:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2022-06-17 08:25:43 +0200
commitc50731ebca48c6216b183bd1e0272dd75033ba41 (patch)
treea7378917dab0fa9a25c3f3632b569b640348de46 /arch/mips
parent339737fcf0a7c4be1d1984283619cb14aaee6aff (diff)
downloadbarebox-c50731ebca48c6216b183bd1e0272dd75033ba41.tar.gz
barebox-c50731ebca48c6216b183bd1e0272dd75033ba41.tar.xz
dma: avoid clash between static inline and extern dma_alloc declarations
dma_alloc/dma_sync/dma_free can be either either static inline definitions usually supplied per arch or extern definitions that can be either generic or supplied per arch. To avoid clashes, expect static inline definitions to define a preprocessor symbol for now. There is much duplication in the static inline helpers, which we can remove in future. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20220614091556.1018102-1-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/dma-mapping.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index 19d5b3f7bc..8e6ea08168 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -10,6 +10,7 @@
#include <malloc.h>
#include <asm/io.h>
+#define dma_alloc_coherent dma_alloc_coherent
static inline void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
{
void *ret;
@@ -26,6 +27,7 @@ static inline void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle)
return (void *)CKSEG1ADDR(ret);
}
+#define dma_free_coherent dma_free_coherent
static inline void dma_free_coherent(void *vaddr, dma_addr_t dma_handle,
size_t size)
{