Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7610fdf5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

powerpc/dma: remove get_dma_offset 



Just fold the calculation into __phys_to_dma/__dma_to_phys as those are
the only places that should know about it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 68005b67

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

+6 −2
Original line number Diff line number Diff line
@@ -13,11 +13,15 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) 


static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)

{

	return paddr + get_dma_offset(dev);

	if (!dev)

		return paddr + PCI_DRAM_OFFSET;

	return paddr + dev->archdata.dma_offset;

}



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

{

	return daddr - get_dma_offset(dev);

	if (!dev)

		return daddr - PCI_DRAM_OFFSET;

	return daddr - dev->archdata.dma_offset;

}

#endif /* ASM_POWERPC_DMA_DIRECT_H */

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

+0 −16
Original line number Diff line number Diff line
@@ -43,22 +43,6 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
	return NULL;

}



/*

 * get_dma_offset()

 *

 * Get the dma offset on configurations where the dma address can be determined

 * from the physical address by looking at a simple offset.  Direct dma and

 * swiotlb use this function, but it is typically not used by implementations

 * with an iommu.

 */

static inline dma_addr_t get_dma_offset(struct device *dev)

{

	if (dev)

		return dev->archdata.dma_offset;



	return PCI_DRAM_OFFSET;

}



static inline void set_dma_offset(struct device *dev, dma_addr_t off)

{

	if (dev)