diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 17:36:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:56 -0400 |
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, | |||
169 | 169 | ||
170 | flush_write_buffers(); | 170 | flush_write_buffers(); |
171 | } | 171 | } |
172 | |||
173 | static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, | ||
174 | size_t offset, size_t size, | ||
175 | int direction) | ||
176 | { | ||
177 | return dma_map_single(dev, page_address(page)+offset, size, direction); | ||
178 | } | ||
179 | |||
180 | static inline void dma_unmap_page(struct device *dev, dma_addr_t addr, | ||
181 | size_t size, int direction) | ||
182 | { | ||
183 | dma_unmap_single(dev, addr, size, direction); | ||
184 | } | ||
185 | |||
172 | #endif | 186 | #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 @@ | |||
8 | #include <asm/io.h> | 8 | #include <asm/io.h> |
9 | #include <asm/bug.h> | 9 | #include <asm/bug.h> |
10 | 10 | ||
11 | static inline dma_addr_t | ||
12 | dma_map_page(struct device *dev, struct page *page, unsigned long offset, | ||
13 | size_t size, enum dma_data_direction direction) | ||
14 | { | ||
15 | BUG_ON(!valid_dma_direction(direction)); | ||
16 | return page_to_phys(page) + offset; | ||
17 | } | ||
18 | |||
19 | static inline void | ||
20 | dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, | ||
21 | enum dma_data_direction direction) | ||
22 | { | ||
23 | BUG_ON(!valid_dma_direction(direction)); | ||
24 | } | ||
25 | |||
26 | static inline int | 11 | static inline int |
27 | dma_mapping_error(dma_addr_t dma_addr) | 12 | dma_mapping_error(dma_addr_t dma_addr) |
28 | { | 13 | { |
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) | |||
12 | return (dma_addr == bad_dma_address); | 12 | return (dma_addr == bad_dma_address); |
13 | } | 13 | } |
14 | 14 | ||
15 | #define dma_map_page(dev,page,offset,size,dir) \ | ||
16 | dma_map_single((dev), page_address(page)+(offset), (size), (dir)) | ||
17 | |||
18 | #define dma_unmap_page dma_unmap_single | ||
19 | extern int dma_supported(struct device *hwdev, u64 mask); | 15 | extern int dma_supported(struct device *hwdev, u64 mask); |
20 | 16 | ||
21 | /* same for gart, swiotlb, and nommu */ | 17 | /* same for gart, swiotlb, and nommu */ |