Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1234e3fd authored by Russell King's avatar Russell King
Browse files

ARM: reduce visibility of dmac_* functions 



The dmac_* functions are private to the ARM DMA API implementation, and
should not be used by drivers.  In order to discourage their use, remove
their prototypes and macros from asm/*.h.

We have to leave dmac_flush_range() behind as Exynos and MSM IOMMU code
use these; once these sites are fixed, this can be moved also.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9ac87c5a

arch/arm/include/asm/cacheflush.h

+0 −4
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ extern struct cpu_cache_fns cpu_cache; 
 * is visible to DMA, or data written by DMA to system memory is

 * visible to the CPU.

 */

#define dmac_map_area			cpu_cache.dma_map_area

#define dmac_unmap_area			cpu_cache.dma_unmap_area

#define dmac_flush_range		cpu_cache.dma_flush_range



#else
@@ -161,8 +159,6 @@ extern void __cpuc_flush_dcache_area(void *, size_t); 
 * is visible to DMA, or data written by DMA to system memory is

 * visible to the CPU.

 */

extern void dmac_map_area(const void *, size_t, int);

extern void dmac_unmap_area(const void *, size_t, int);

extern void dmac_flush_range(const void *, const void *);



#endif

arch/arm/include/asm/glue-cache.h

+0 −2
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } 
#define __cpuc_coherent_user_range	__glue(_CACHE,_coherent_user_range)

#define __cpuc_flush_dcache_area	__glue(_CACHE,_flush_kern_dcache_area)



#define dmac_map_area			__glue(_CACHE,_dma_map_area)

#define dmac_unmap_area			__glue(_CACHE,_dma_unmap_area)

#define dmac_flush_range		__glue(_CACHE,_dma_flush_range)

#endif

arch/arm/mm/dma-mapping.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <asm/system_info.h>

#include <asm/dma-contiguous.h>



#include "dma.h"

#include "mm.h"



/*

arch/arm/mm/dma.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#ifndef DMA_H

#define DMA_H



#include <asm/glue-cache.h>



#ifndef MULTI_CACHE

#define dmac_map_area			__glue(_CACHE,_dma_map_area)

#define dmac_unmap_area 		__glue(_CACHE,_dma_unmap_area)



/*

 * These are private to the dma-mapping API.  Do not use directly.

 * Their sole purpose is to ensure that data held in the cache

 * is visible to DMA, or data written by DMA to system memory is

 * visible to the CPU.

 */

extern void dmac_map_area(const void *, size_t, int);

extern void dmac_unmap_area(const void *, size_t, int);



#else



/*

 * These are private to the dma-mapping API.  Do not use directly.

 * Their sole purpose is to ensure that data held in the cache

 * is visible to DMA, or data written by DMA to system memory is

 * visible to the CPU.

 */

#define dmac_map_area			cpu_cache.dma_map_area

#define dmac_unmap_area 		cpu_cache.dma_unmap_area



#endif



#endif