Commit 7bc5c428 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-direct: remove __dma_to_phys 



There is no harm in just always clearing the SME encryption bit, while
significantly simplifying the interface.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) 
	return pfn_to_dma(dev, __phys_to_pfn(paddr)) + offset;

}



static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr)

static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr)

{

	unsigned int offset = dev_addr & ~PAGE_MASK;

	return __pfn_to_phys(dma_to_pfn(dev, dev_addr)) + offset;

arch/mips/bmips/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t pa) 
	return pa;

}



phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dma_addr)

phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dma_addr)

{

	struct bmips_dma_range *r;

arch/mips/cavium-octeon/dma-octeon.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) 
	return paddr;

}



phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr)

phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)

{

#ifdef CONFIG_PCI

	if (dev && dev_is_pci(dev))

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

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
#define _MIPS_DMA_DIRECT_H 1



dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr);

phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);

phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);



#endif /* _MIPS_DMA_DIRECT_H */

arch/mips/loongson2ef/fuloong-2e/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) 
	return paddr | 0x80000000;

}



phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dma_addr)

phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dma_addr)

{

	return dma_addr & 0x7fffffff;

}