aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-25 17:36:25 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-19 13:19:56 -0400
commitc01dd8cf7d19b869af1668c80a34a955c871f607 (patch)
tree19c2dcb7fddc96368692be8858ea80dfe20310b8 /include
parent72c784f82c378df1903676acd2efc5eeb5cac579 (diff)
x86: move dma_sync_single_for_cpu to common header
i386 gets an empty function. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/dma-mapping.h12
-rw-r--r--include/asm-x86/dma-mapping_32.h6
-rw-r--r--include/asm-x86/dma-mapping_64.h11
3 files changed, 12 insertions, 17 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index 6e7747a23e5b..507069d231dd 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -91,4 +91,16 @@ dma_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
91 if (dma_ops->unmap_sg) 91 if (dma_ops->unmap_sg)
92 dma_ops->unmap_sg(hwdev, sg, nents, direction); 92 dma_ops->unmap_sg(hwdev, sg, nents, direction);
93} 93}
94
95static inline void
96dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
97 size_t size, int direction)
98{
99 BUG_ON(!valid_dma_direction(direction));
100 if (dma_ops->sync_single_for_cpu)
101 dma_ops->sync_single_for_cpu(hwdev, dma_handle, size,
102 direction);
103 flush_write_buffers();
104}
105
94#endif 106#endif
diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h
index 55445e3e2d66..a05b2fc810bb 100644
--- a/include/asm-x86/dma-mapping_32.h
+++ b/include/asm-x86/dma-mapping_32.h
@@ -33,12 +33,6 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
33} 33}
34 34
35static inline void 35static inline void
36dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
37 enum dma_data_direction direction)
38{
39}
40
41static inline void
42dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, 36dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
43 enum dma_data_direction direction) 37 enum dma_data_direction direction)
44{ 38{
diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h
index ce37efb847b3..b055964d1a27 100644
--- a/include/asm-x86/dma-mapping_64.h
+++ b/include/asm-x86/dma-mapping_64.h
@@ -29,17 +29,6 @@ extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
29#define dma_unmap_page dma_unmap_single 29#define dma_unmap_page dma_unmap_single
30 30
31static inline void 31static inline void
32dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
33 size_t size, int direction)
34{
35 BUG_ON(!valid_dma_direction(direction));
36 if (dma_ops->sync_single_for_cpu)
37 dma_ops->sync_single_for_cpu(hwdev, dma_handle, size,
38 direction);
39 flush_write_buffers();
40}
41
42static inline void
43dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle, 32dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle,
44 size_t size, int direction) 33 size_t size, int direction)
45{ 34{