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

Commit efa21e43 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

dma-mapping: cosolidate dma_mapping_error 



Currently there are three valid implementations of dma_mapping_error:

 (1) call ->mapping_error
 (2) check for a hardcoded error code
 (3) always return 0

This patch provides a common implementation that calls ->mapping_error
if present, then checks for DMA_ERROR_CODE if defined or otherwise
returns 0.

[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1e893752

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

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) 


#include <asm-generic/dma-mapping-common.h>



static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return get_dma_ops(dev)->mapping_error(dev, dma_addr);

}



static inline int dma_supported(struct device *dev, u64 mask)

{

	return get_dma_ops(dev)->dma_supported(dev, mask);

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

+0 −9
Original line number Diff line number Diff line
@@ -172,15 +172,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) 


static inline void dma_mark_clean(void *addr, size_t size) { }



/*

 * DMA errors are defined by all-bits-set in the DMA address.

 */

static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	debug_dma_mapping_error(dev, dma_addr);

	return dma_addr == DMA_ERROR_CODE;

}



extern int dma_supported(struct device *dev, u64 mask);



extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);

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

+0 −7
Original line number Diff line number Diff line
@@ -84,13 +84,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr) 
	return (phys_addr_t)dev_addr;

}



static inline int dma_mapping_error(struct device *dev, dma_addr_t dev_addr)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	debug_dma_mapping_error(dev, dev_addr);

	return ops->mapping_error(dev, dev_addr);

}



static inline int dma_supported(struct device *dev, u64 mask)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

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

+0 −5
Original line number Diff line number Diff line
@@ -20,9 +20,4 @@ static inline int dma_set_mask(struct device *dev, u64 mask) 
	return 0;

}



static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return 0;

}



#endif

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

+1 −10
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


struct device;

extern int bad_dma_address;

#define DMA_ERROR_CODE bad_dma_address



extern struct dma_map_ops *dma_ops;
@@ -57,14 +58,4 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) 
	return addr + size - 1 <= *dev->dma_mask;

}



static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	struct dma_map_ops *dma_ops = get_dma_ops(dev);



	if (dma_ops->mapping_error)

		return dma_ops->mapping_error(dev, dma_addr);



	return (dma_addr == bad_dma_address);

}



#endif