| Message ID | 20181114082314.8965-8-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/34] powerpc: use mm zones more sensibly | expand |
ping? On Wed, Nov 14, 2018 at 09:22:47AM +0100, Christoph Hellwig wrote: > These methods are optional, no need to implement no-op versions. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > arch/powerpc/kernel/dma.c | 16 ---------------- > 1 file changed, 16 deletions(-) > > diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c > index d6deb458bb91..7078d72baec2 100644 > --- a/arch/powerpc/kernel/dma.c > +++ b/arch/powerpc/kernel/dma.c > @@ -197,12 +197,6 @@ static int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl, > return nents; > } > > -static void dma_nommu_unmap_sg(struct device *dev, struct scatterlist *sg, > - int nents, enum dma_data_direction direction, > - unsigned long attrs) > -{ > -} > - > static u64 dma_nommu_get_required_mask(struct device *dev) > { > u64 end, mask; > @@ -228,14 +222,6 @@ static inline dma_addr_t dma_nommu_map_page(struct device *dev, > return page_to_phys(page) + offset + get_dma_offset(dev); > } > > -static inline void dma_nommu_unmap_page(struct device *dev, > - dma_addr_t dma_address, > - size_t size, > - enum dma_data_direction direction, > - unsigned long attrs) > -{ > -} > - > #ifdef CONFIG_NOT_COHERENT_CACHE > static inline void dma_nommu_sync_sg(struct device *dev, > struct scatterlist *sgl, int nents, > @@ -261,10 +247,8 @@ const struct dma_map_ops dma_nommu_ops = { > .free = dma_nommu_free_coherent, > .mmap = dma_nommu_mmap_coherent, > .map_sg = dma_nommu_map_sg, > - .unmap_sg = dma_nommu_unmap_sg, > .dma_supported = dma_nommu_dma_supported, > .map_page = dma_nommu_map_page, > - .unmap_page = dma_nommu_unmap_page, > .get_required_mask = dma_nommu_get_required_mask, > #ifdef CONFIG_NOT_COHERENT_CACHE > .sync_single_for_cpu = dma_nommu_sync_single, > -- > 2.19.1 > > _______________________________________________ > iommu mailing list > iommu@lists.linux-foundation.org > https://lists.linuxfoundation.org/mailman/listinfo/iommu ---end quoted text---
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index d6deb458bb91..7078d72baec2 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -197,12 +197,6 @@ static int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl, return nents; } -static void dma_nommu_unmap_sg(struct device *dev, struct scatterlist *sg, - int nents, enum dma_data_direction direction, - unsigned long attrs) -{ -} - static u64 dma_nommu_get_required_mask(struct device *dev) { u64 end, mask; @@ -228,14 +222,6 @@ static inline dma_addr_t dma_nommu_map_page(struct device *dev, return page_to_phys(page) + offset + get_dma_offset(dev); } -static inline void dma_nommu_unmap_page(struct device *dev, - dma_addr_t dma_address, - size_t size, - enum dma_data_direction direction, - unsigned long attrs) -{ -} - #ifdef CONFIG_NOT_COHERENT_CACHE static inline void dma_nommu_sync_sg(struct device *dev, struct scatterlist *sgl, int nents, @@ -261,10 +247,8 @@ const struct dma_map_ops dma_nommu_ops = { .free = dma_nommu_free_coherent, .mmap = dma_nommu_mmap_coherent, .map_sg = dma_nommu_map_sg, - .unmap_sg = dma_nommu_unmap_sg, .dma_supported = dma_nommu_dma_supported, .map_page = dma_nommu_map_page, - .unmap_page = dma_nommu_unmap_page, .get_required_mask = dma_nommu_get_required_mask, #ifdef CONFIG_NOT_COHERENT_CACHE .sync_single_for_cpu = dma_nommu_sync_single,