sparc: remove leon_dma_ops (c6d333e0) · Commits · 戴 / test

arch/sparc/include/asm/dma-mapping.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)

+1 −4

Original line number	Diff line number	Diff line
		@@ -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);