Commit 002a26fb authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

ARM/dma-mapping: remove dma_to_virt 



dma_to_virt is entirely unused, remove it.

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

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

+1 −17
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
}



/*

 * dma_to_pfn/pfn_to_dma/dma_to_virt/virt_to_dma are architecture private

 * dma_to_pfn/pfn_to_dma/virt_to_dma are architecture private

 * functions used internally by the DMA-mapping API to provide DMA

 * addresses. They must not be used by drivers.

 */
@@ -46,17 +46,6 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) 
	return pfn;

}



static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)

{

	if (dev) {

		unsigned long pfn = dma_to_pfn(dev, addr);



		return phys_to_virt(__pfn_to_phys(pfn));

	}



	return (void *)__bus_to_virt((unsigned long)addr);

}



static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)

{

	if (dev)
@@ -76,11 +65,6 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) 
	return __arch_dma_to_pfn(dev, addr);

}



static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)

{

	return __arch_dma_to_virt(dev, addr);

}



static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)

{

	return __arch_virt_to_dma(dev, addr);

arch/arm/mach-omap1/include/mach/memory.h

+0 −4
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ 
	   __phys_to_pfn(__dma);				\

	})



#define __arch_dma_to_virt(dev, addr)	({ (void *) (is_lbus_device(dev) ? \

						lbus_to_virt(addr) : \

						__phys_to_virt(addr)); })



#define __arch_virt_to_dma(dev, addr)	({ unsigned long __addr = (unsigned long)(addr); \

					   (dma_addr_t) (is_lbus_device(dev) ? \

						virt_to_lbus(__addr) : \