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

sparc: remove leon_dma_ops

We can just use pci32_dma_ops directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: David S. Miller <davem@davemloft.net>

+2 -6
+1 -2
arch/sparc/include/asm/dma-mapping.h
··· 17 17 } 18 18 19 19 extern const struct dma_map_ops *dma_ops; 20 - extern const struct dma_map_ops *leon_dma_ops; 21 20 extern const struct dma_map_ops pci32_dma_ops; 22 21 23 22 extern struct bus_type pci_bus_type; ··· 25 26 { 26 27 #ifdef CONFIG_SPARC_LEON 27 28 if (sparc_cpu_model == sparc_leon) 28 - return leon_dma_ops; 29 + return &pci32_dma_ops; 29 30 #endif 30 31 #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) 31 32 if (bus == &pci_bus_type)
+1 -4
arch/sparc/kernel/ioport.c
··· 637 637 } 638 638 } 639 639 640 + /* note: leon re-uses pci32_dma_ops */ 640 641 const struct dma_map_ops pci32_dma_ops = { 641 642 .alloc = pci32_alloc_coherent, 642 643 .free = pci32_free_coherent, ··· 651 650 .sync_sg_for_device = pci32_sync_sg_for_device, 652 651 }; 653 652 EXPORT_SYMBOL(pci32_dma_ops); 654 - 655 - /* leon re-uses pci32_dma_ops */ 656 - const struct dma_map_ops *leon_dma_ops = &pci32_dma_ops; 657 - EXPORT_SYMBOL(leon_dma_ops); 658 653 659 654 const struct dma_map_ops *dma_ops = &sbus_dma_ops; 660 655 EXPORT_SYMBOL(dma_ops);