diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 17:36:26 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:56 -0400 |
commit | 9231b269e09ed60910c159cf668f887623b7ac58 (patch) | |
tree | 9b0e567884735a5b6f4b9c4cc675b63bc8d947ca /include | |
parent | c01dd8cf7d19b869af1668c80a34a955c871f607 (diff) |
x86: move dma_sync_single_for_device 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.h | 11 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_32.h | 7 | ||||
-rw-r--r-- | include/asm-x86/dma-mapping_64.h | 11 |
3 files changed, 11 insertions, 18 deletions
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h index 507069d231dd..8ad582c2080a 100644 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h | |||
@@ -103,4 +103,15 @@ dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle, | |||
103 | flush_write_buffers(); | 103 | flush_write_buffers(); |
104 | } | 104 | } |
105 | 105 | ||
106 | static inline void | ||
107 | dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle, | ||
108 | size_t size, int direction) | ||
109 | { | ||
110 | BUG_ON(!valid_dma_direction(direction)); | ||
111 | if (dma_ops->sync_single_for_device) | ||
112 | dma_ops->sync_single_for_device(hwdev, dma_handle, size, | ||
113 | direction); | ||
114 | flush_write_buffers(); | ||
115 | } | ||
116 | |||
106 | #endif | 117 | #endif |
diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h index a05b2fc810bb..b91771a6a0bd 100644 --- a/include/asm-x86/dma-mapping_32.h +++ b/include/asm-x86/dma-mapping_32.h | |||
@@ -33,13 +33,6 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, | |||
33 | } | 33 | } |
34 | 34 | ||
35 | static inline void | 35 | static inline void |
36 | dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, | ||
37 | enum dma_data_direction direction) | ||
38 | { | ||
39 | flush_write_buffers(); | ||
40 | } | ||
41 | |||
42 | static inline void | ||
43 | dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, | 36 | dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, |
44 | unsigned long offset, size_t size, | 37 | unsigned long offset, size_t size, |
45 | enum dma_data_direction direction) | 38 | enum dma_data_direction direction) |
diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h index b055964d1a27..b539f61f3c78 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 | ||
31 | static inline void | 31 | static inline void |
32 | dma_sync_single_for_device(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_device) | ||
37 | dma_ops->sync_single_for_device(hwdev, dma_handle, size, | ||
38 | direction); | ||
39 | flush_write_buffers(); | ||
40 | } | ||
41 | |||
42 | static inline void | ||
43 | dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle, | 32 | dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle, |
44 | unsigned long offset, size_t size, int direction) | 33 | unsigned long offset, size_t size, int direction) |
45 | { | 34 | { |