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

Commit 8d396ded authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: move alloc and free coherent to common header 



they are the same between architectures. (except for the fact
that x86_64 has duplicate code)

move them to dma-mapping.h

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 e7f3a913

include/asm-x86/dma-mapping.h

+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,16 @@ struct dma_mapping_ops { 


extern const struct dma_mapping_ops *dma_ops;



#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



void *dma_alloc_coherent(struct device *dev, size_t size,

			   dma_addr_t *dma_handle, gfp_t flag);



void dma_free_coherent(struct device *dev, size_t size,

			 void *vaddr, dma_addr_t dma_handle);





#ifdef CONFIG_X86_32

# include "dma-mapping_32.h"

#else

include/asm-x86/dma-mapping_32.h

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

#include <asm/bug.h>



#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



void *dma_alloc_coherent(struct device *dev, size_t size,

			   dma_addr_t *dma_handle, gfp_t flag);



void dma_free_coherent(struct device *dev, size_t size,

			 void *vaddr, dma_addr_t dma_handle);



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)

include/asm-x86/dma-mapping_64.h

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

}



#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



extern void *dma_alloc_coherent(struct device *dev, size_t size,

				dma_addr_t *dma_handle, gfp_t gfp);

extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,

			      dma_addr_t dma_handle);



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

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