| Message ID | 20180110080027.13879-11-hch@lst.de |
|---|---|
| State | New |
| Headers | show |
| Series | [01/33] alpha: mark jensen as broken | expand |
On 10/01/18 08:00, Christoph Hellwig wrote: > The generic version now takes dma_pfn_offset into account, so there is no > more need for an architecture override. Reviewed-by: Robin Murphy <robin.murphy@arm.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/arm64/include/asm/dma-mapping.h | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h > index 0df756b24863..eada887a93bf 100644 > --- a/arch/arm64/include/asm/dma-mapping.h > +++ b/arch/arm64/include/asm/dma-mapping.h > @@ -76,14 +76,5 @@ static inline void dma_mark_clean(void *addr, size_t size) > { > } > > -/* Override for dma_max_pfn() */ > -static inline unsigned long dma_max_pfn(struct device *dev) > -{ > - dma_addr_t dma_max = (dma_addr_t)*dev->dma_mask; > - > - return (ulong)dma_to_phys(dev, dma_max) >> PAGE_SHIFT; > -} > -#define dma_max_pfn(dev) dma_max_pfn(dev) > - > #endif /* __KERNEL__ */ > #endif /* __ASM_DMA_MAPPING_H */ >
diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index 0df756b24863..eada887a93bf 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -76,14 +76,5 @@ static inline void dma_mark_clean(void *addr, size_t size) { } -/* Override for dma_max_pfn() */ -static inline unsigned long dma_max_pfn(struct device *dev) -{ - dma_addr_t dma_max = (dma_addr_t)*dev->dma_mask; - - return (ulong)dma_to_phys(dev, dma_max) >> PAGE_SHIFT; -} -#define dma_max_pfn(dev) dma_max_pfn(dev) - #endif /* __KERNEL__ */ #endif /* __ASM_DMA_MAPPING_H */
The generic version now takes dma_pfn_offset into account, so there is no more need for an architecture override. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/arm64/include/asm/dma-mapping.h | 9 --------- 1 file changed, 9 deletions(-)