Commit 46053c73 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: clear dev->dma_ops in arch_teardown_dma_ops 



There is no reason to leave the per-device dma_ops around when
deconfiguring a device, so move this code from arm64 into the
common code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
parent dc3c0550

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

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, 
			const struct iommu_ops *iommu, bool coherent);

#define arch_setup_dma_ops	arch_setup_dma_ops



#ifdef CONFIG_IOMMU_DMA

void arch_teardown_dma_ops(struct device *dev);

#define arch_teardown_dma_ops	arch_teardown_dma_ops

#endif



/* do not use this function in a driver */

static inline bool is_device_dma_coherent(struct device *dev)

{

arch/arm64/mm/dma-mapping.c

+0 −5
Original line number Diff line number Diff line
@@ -862,11 +862,6 @@ out_err: 
		 dev_name(dev));

}



void arch_teardown_dma_ops(struct device *dev)

{

	dev->dma_ops = NULL;

}



#else



static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

include/linux/dma-mapping.h

+4 −1
Original line number Diff line number Diff line
@@ -664,7 +664,10 @@ static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, 
#endif



#ifndef arch_teardown_dma_ops

static inline void arch_teardown_dma_ops(struct device *dev) { }

static inline void arch_teardown_dma_ops(struct device *dev)

{

	dev->dma_ops = NULL;

}

#endif



static inline unsigned int dma_get_max_seg_size(struct device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE