Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dma-mapping: remove the dma_direct_set_offset export

Drop the dma_direct_set_offset export and move the declaration to
dma-map-ops.h now that the Allwinner drivers have stopped calling it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

authored by

Christoph Hellwig and committed by
Maxime Ripard
16fee29b 57393013

+8 -12
+1 -1
arch/arm/mach-keystone/keystone.c
··· 8 8 */ 9 9 #include <linux/io.h> 10 10 #include <linux/of.h> 11 - #include <linux/dma-mapping.h> 11 + #include <linux/dma-map-ops.h> 12 12 #include <linux/init.h> 13 13 #include <linux/of_platform.h> 14 14 #include <linux/of_address.h>
+1 -1
arch/arm/mach-omap1/usb.c
··· 9 9 #include <linux/kernel.h> 10 10 #include <linux/init.h> 11 11 #include <linux/platform_device.h> 12 - #include <linux/dma-mapping.h> 12 + #include <linux/dma-map-ops.h> 13 13 #include <linux/io.h> 14 14 15 15 #include <asm/irq.h>
+1 -1
arch/sh/drivers/pci/pcie-sh7786.c
··· 12 12 #include <linux/io.h> 13 13 #include <linux/async.h> 14 14 #include <linux/delay.h> 15 - #include <linux/dma-mapping.h> 15 + #include <linux/dma-map-ops.h> 16 16 #include <linux/slab.h> 17 17 #include <linux/clk.h> 18 18 #include <linux/sh_clk.h>
+2 -1
arch/x86/pci/sta2x11-fixup.c
··· 11 11 #include <linux/pci_ids.h> 12 12 #include <linux/export.h> 13 13 #include <linux/list.h> 14 - #include <linux/dma-direct.h> 14 + #include <linux/dma-map-ops.h> 15 + #include <linux/swiotlb.h> 15 16 #include <asm/iommu.h> 16 17 17 18 #define STA2X11_SWIOTLB_SIZE (4*1024*1024)
+3
include/linux/dma-map-ops.h
··· 226 226 bool (*phys_addr_ok)(struct device *, phys_addr_t, size_t)); 227 227 bool dma_free_from_pool(struct device *dev, void *start, size_t size); 228 228 229 + int dma_direct_set_offset(struct device *dev, phys_addr_t cpu_start, 230 + dma_addr_t dma_start, u64 size); 231 + 229 232 #ifdef CONFIG_ARCH_HAS_DMA_COHERENCE_H 230 233 #include <asm/dma-coherence.h> 231 234 #elif defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \
-7
include/linux/dma-mapping.h
··· 558 558 #define dma_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) 559 559 #endif 560 560 561 - /* 562 - * Legacy interface to set up the dma offset map. Drivers really should not 563 - * actually use it, but we have a few legacy cases left. 564 - */ 565 - int dma_direct_set_offset(struct device *dev, phys_addr_t cpu_start, 566 - dma_addr_t dma_start, u64 size); 567 - 568 561 extern const struct dma_map_ops dma_virt_ops; 569 562 570 563 #endif /* _LINUX_DMA_MAPPING_H */
-1
kernel/dma/direct.c
··· 547 547 dev->dma_range_map = map; 548 548 return 0; 549 549 } 550 - EXPORT_SYMBOL_GPL(dma_direct_set_offset);