| Message ID | 20220421074204.1284072-5-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/7] ARM: sa1100/assabet: move dmabounce hack to ohci driver | expand |
On Thu, Apr 21, 2022 at 9:42 AM Christoph Hellwig <hch@lst.de> wrote: > > Signed-off-by: Christoph Hellwig <hch@lst.de> I generally prefer to have at least something useful in the description, e.g. why it's now unused and what it was used for before. > -static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) > -{ > - if (dev) > - return pfn_to_dma(dev, virt_to_pfn(addr)); > - > - return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); > -} I think __virt_to_bus() is now unused as well and could be removed in the same step. It looks like __bus_to_virt() is still used in the ISA DMA API, but as that is only used on footbridge and rpc, the generic version of that could be moved into rpc (footbridge already has a custom version). Arnd
On Thu, Apr 21, 2022 at 10:00:55AM +0200, Arnd Bergmann wrote: > I think __virt_to_bus() is now unused as well and could be removed > in the same step. Yes. > It looks like __bus_to_virt() is still used in the ISA DMA API, but > as that is only used on footbridge and rpc, the generic version of > that could be moved into rpc (footbridge already has a custom > version). That sounds like a useful cleanup, but isn't really in scope for this series.
diff --git a/arch/arm/include/asm/dma-direct.h b/arch/arm/include/asm/dma-direct.h index 77fcb7ee5ec90..6fd52713b5d12 100644 --- a/arch/arm/include/asm/dma-direct.h +++ b/arch/arm/include/asm/dma-direct.h @@ -5,7 +5,7 @@ #include <asm/memory.h> /* - * dma_to_pfn/pfn_to_dma/virt_to_dma are architecture private + * dma_to_pfn/pfn_to_dma are architecture private * functions used internally by the DMA-mapping API to provide DMA * addresses. They must not be used by drivers. */ @@ -25,14 +25,6 @@ static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr) return pfn; } -static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) -{ - if (dev) - return pfn_to_dma(dev, virt_to_pfn(addr)); - - return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); -} - static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr) { unsigned int offset = paddr & ~PAGE_MASK;
Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/arm/include/asm/dma-direct.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)