Commit b49efd76 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: move dma_mark_clean to dma-direct.h 



And unlike the other helpers we don't require a <asm/dma-direct.h> as
this helper is a special case for ia64 only, and this keeps it as
simple as possible.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent ea8c64ac

arch/arm/include/asm/dma-mapping.h

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ static inline bool is_device_dma_coherent(struct device *dev) 
	return dev->archdata.dma_coherent;

}



static inline void dma_mark_clean(void *addr, size_t size) { }



/**

 * arm_dma_alloc - allocate consistent memory for DMA

 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices

arch/arm64/include/asm/dma-mapping.h

+0 −4
Original line number Diff line number Diff line
@@ -50,9 +50,5 @@ static inline bool is_device_dma_coherent(struct device *dev) 
	return dev->archdata.dma_coherent;

}



static inline void dma_mark_clean(void *addr, size_t size)

{

}



#endif	/* __KERNEL__ */

#endif	/* __ASM_DMA_MAPPING_H */

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ config IA64 
	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_VIRT_CPU_ACCOUNTING

	select ARCH_HAS_DMA_MARK_CLEAN

	select ARCH_HAS_SG_CHAIN

	select VIRT_TO_BUS

	select ARCH_DISCARD_MEMBLOCK

arch/ia64/include/asm/dma.h

+0 −2
Original line number Diff line number Diff line
@@ -20,6 +20,4 @@ extern unsigned long MAX_DMA_ADDRESS; 


#define free_dma(x)



void dma_mark_clean(void *addr, size_t size);



#endif /* _ASM_IA64_DMA_H */

arch/mips/include/asm/dma-mapping.h

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
	return mips_dma_map_ops;

}



static inline void dma_mark_clean(void *addr, size_t size) {}



#define arch_setup_dma_ops arch_setup_dma_ops

static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base,

				      u64 size, const struct iommu_ops *iommu,