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

Commit ab642e95 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Christoph Hellwig
Browse files

dma-coherent: Add NO_DMA dummies for managed DMA API 



Add dummies for dmam_{alloc,free}_coherent(), to allow compile-testing
if NO_DMA=y.

This prevents the following from showing up later:

    ERROR: "dmam_alloc_coherent" [drivers/net/ethernet/arc/arc_emac.ko] undefined!
    ERROR: "dmam_free_coherent" [drivers/net/ethernet/apm/xgene/xgene-enet.ko] undefined!
    ERROR: "dmam_alloc_coherent" [drivers/net/ethernet/apm/xgene/xgene-enet.ko] undefined!
    ERROR: "dmam_alloc_coherent" [drivers/mtd/nand/hisi504_nand.ko] undefined!
    ERROR: "dmam_alloc_coherent" [drivers/mmc/host/dw_mmc.ko] undefined!

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f29ab49b

include/linux/dma-mapping.h

+9 −0
Original line number Diff line number Diff line
@@ -776,10 +776,19 @@ static inline void dma_deconfigure(struct device *dev) {} 
/*

 * Managed DMA API

 */

#ifdef CONFIG_HAS_DMA

extern void *dmam_alloc_coherent(struct device *dev, size_t size,

				 dma_addr_t *dma_handle, gfp_t gfp);

extern void dmam_free_coherent(struct device *dev, size_t size, void *vaddr,

			       dma_addr_t dma_handle);

#else /* !CONFIG_HAS_DMA */

static inline void *dmam_alloc_coherent(struct device *dev, size_t size,

					dma_addr_t *dma_handle, gfp_t gfp)

{ return NULL; }

static inline void dmam_free_coherent(struct device *dev, size_t size,

				      void *vaddr, dma_addr_t dma_handle) { }

#endif /* !CONFIG_HAS_DMA */



extern void *dmam_alloc_attrs(struct device *dev, size_t size,

			      dma_addr_t *dma_handle, gfp_t gfp,

			      unsigned long attrs);