Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d3b83dcc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Paul Burton
Browse files

MIPS: remove the mips_dma_map_ops indirection 



And use mips_default_dma_map_ops directly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Patchwork: https://patchwork.linux-mips.org/patch/19535/


Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Tom Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: iommu@lists.linux-foundation.org
Cc: linux-mips@linux-mips.org
parent f6d302e3

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

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <dma-coherence.h>

#endif



extern const struct dma_map_ops *mips_dma_map_ops;

extern const struct dma_map_ops mips_default_dma_map_ops;

extern const struct dma_map_ops mips_swiotlb_ops;



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
@@ -18,7 +18,7 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
#ifdef CONFIG_SWIOTLB

	return &mips_swiotlb_ops;

#else

	return mips_dma_map_ops;

	return &mips_default_dma_map_ops;

#endif

}

arch/mips/mm/dma-default.c

+2 −4
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static void mips_dma_cache_sync(struct device *dev, void *vaddr, size_t size, 
		__dma_sync_virtual(vaddr, size, direction);

}



static const struct dma_map_ops mips_default_dma_map_ops = {

const struct dma_map_ops mips_default_dma_map_ops = {

	.alloc = mips_dma_alloc_coherent,

	.free = mips_dma_free_coherent,

	.mmap = mips_dma_mmap,
@@ -399,6 +399,4 @@ static const struct dma_map_ops mips_default_dma_map_ops = { 
	.dma_supported = mips_dma_supported,

	.cache_sync = mips_dma_cache_sync,

};



const struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;

EXPORT_SYMBOL(mips_dma_map_ops);
 
EXPORT_SYMBOL(mips_default_dma_map_ops);