On Tue, Jan 23, 2018 at 05:40:10PM -0800, Florian Fainelli wrote: > diff --git a/arch/mips/include/asm/mach-ath25/dma-coherence.h b/arch/mips/include/asm/mach-ath25/dma-coherence.h > index d5defdde32db..63bce15fa54d 100644 > --- a/arch/mips/include/asm/mach-ath25/dma-coherence.h > +++ b/arch/mips/include/asm/mach-ath25/dma-coherence.h > +#define plat_unmap_dma_mem plat_unmap_dma_mem > static inline void > plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr, size_t size, > enum dma_data_direction direction) > { > } This could presumably be removed too. > diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h > index 9110988b92a1..165e13aba3ff 100644 > --- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h > +++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h > +#define phys_to_dma phys_to_dma > dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); > +#define dma_to_phys dma_to_phys > phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); I suppose these #defines can be dropped since commit ea8c64ace866 ("dma-mapping: move swiotlb arch helpers to a new header"). > diff --git a/arch/mips/include/asm/mach-loongson64/dma-coherence.h b/arch/mips/include/asm/mach-loongson64/dma-coherence.h > index 1602a9e9e8c2..0a9bbc4c1449 100644 > --- a/arch/mips/include/asm/mach-loongson64/dma-coherence.h > +++ b/arch/mips/include/asm/mach-loongson64/dma-coherence.h > +#define phys_to_dma phys_to_dma > extern dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); > +#define dma_to_phys dma_to_phys > extern phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); same here > +#define plat_dma_supported plat_dma_supported > static inline int plat_dma_supported(struct device *dev, u64 mask) > { > /* > @@ -69,6 +70,7 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) > return 1; > } That can be removed too, no? Cheers James
Attachment:
signature.asc
Description: Digital signature