sparc: remove leon_dma_ops

Christoph Hellwig · Christoph Hellwig · commit c6d333e08472 · 2017-06-28T06:54:38.000-07:00
We can just use pci32_dma_ops directly.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Acked-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
@@ -17,7 +17,6 @@ static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
 }
 
 extern const struct dma_map_ops *dma_ops;
-extern const struct dma_map_ops *leon_dma_ops;
 extern const struct dma_map_ops pci32_dma_ops;
 
 extern struct bus_type pci_bus_type;
@@ -26,7 +25,7 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
 {
 #ifdef CONFIG_SPARC_LEON
 	if (sparc_cpu_model == sparc_leon)
-		return leon_dma_ops;
+		return &pci32_dma_ops;
 #endif
 #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
 	if (bus == &pci_bus_type)
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
@@ -637,6 +637,7 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist *
 	}
 }
 
+/* note: leon re-uses pci32_dma_ops */
 const struct dma_map_ops pci32_dma_ops = {
 	.alloc			= pci32_alloc_coherent,
 	.free			= pci32_free_coherent,
@@ -651,10 +652,6 @@ const struct dma_map_ops pci32_dma_ops = {
 };
 EXPORT_SYMBOL(pci32_dma_ops);
 
-/* leon re-uses pci32_dma_ops */
-const struct dma_map_ops *leon_dma_ops = &pci32_dma_ops;
-EXPORT_SYMBOL(leon_dma_ops);
-
 const struct dma_map_ops *dma_ops = &sbus_dma_ops;
 EXPORT_SYMBOL(dma_ops);
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ static inline void dma_cache_sync(struct device dev, void vaddr, size_t size,`
`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;`
`@@ -26,7 +25,7 @@ static inline const struct dma_map_ops get_arch_dma_ops(struct bus_type bus)`
`26`	`25`	`{`
`27`	`26`	`#ifdef CONFIG_SPARC_LEON`
`28`	`27`	`if (sparc_cpu_model == sparc_leon)`
`29`		`- return leon_dma_ops;`
	`28`	`+ return &pci32_dma_ops;`
`30`	`29`	`#endif`
`31`	`30`	`#if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)`
`32`	`31`	`if (bus == &pci_bus_type)`