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

Commit 4d92fbf2 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: move dma_map_page and dma_unmap_page to common header 



They are similar enough to do this move.
the macro version is ugly, and we use inline functions instead.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8d396ded

include/asm-x86/dma-mapping.h

+14 −0
Original line number Diff line number Diff line
@@ -169,4 +169,18 @@ dma_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg, 


	flush_write_buffers();

}



static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,

				      size_t offset, size_t size,

				      int direction)

{

	return dma_map_single(dev, page_address(page)+offset, size, direction);

}



static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,

				  size_t size, int direction)

{

	dma_unmap_single(dev, addr, size, direction);

}



#endif

include/asm-x86/dma-mapping_32.h

+0 −15
Original line number Diff line number Diff line
@@ -8,21 +8,6 @@ 
#include <asm/io.h>

#include <asm/bug.h>



static inline dma_addr_t

dma_map_page(struct device *dev, struct page *page, unsigned long offset,

	     size_t size, enum dma_data_direction direction)

{

	BUG_ON(!valid_dma_direction(direction));

	return page_to_phys(page) + offset;

}



static inline void

dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,

	       enum dma_data_direction direction)

{

	BUG_ON(!valid_dma_direction(direction));

}



static inline int

dma_mapping_error(dma_addr_t dma_addr)

{

include/asm-x86/dma-mapping_64.h

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ static inline int dma_mapping_error(dma_addr_t dma_addr) 
	return (dma_addr == bad_dma_address);

}



#define dma_map_page(dev,page,offset,size,dir) \

	dma_map_single((dev), page_address(page)+(offset), (size), (dir))



#define dma_unmap_page dma_unmap_single

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



/* same for gart, swiotlb, and nommu */