diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 18:36:32 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:56 +0200 |
| commit | 4d92fbf231fe23ec07d18820a141c573a7f5017a (patch) | |
| tree | 13187ca7d82f2356e22b6ba4a2cef12dcd95d976 | |
| parent | 8d396ded71a9b378fc3e846095e50565606f2df6 (diff) | |
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: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/asm-x86/dma-mapping.h | 14 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping_32.h | 15 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping_64.h | 4 |
3 files changed, 14 insertions, 19 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index 3ea3802ff1aa..b5a413acac96 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h @@ -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 diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h index d8f6420d3ef1..c61ae7ff222c 100644 --- a/include/asm-x86/dma-mapping_32.h +++ b/include/asm-x86/dma-mapping_32.h @@ -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) { diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h index ce881d992228..2b4a43080db9 100644 --- a/include/asm-x86/dma-mapping_64.h +++ b/include/asm-x86/dma-mapping_64.h @@ -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 */ |