diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 18:36:25 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 19:19:56 +0200 |
| commit | c01dd8cf7d19b869af1668c80a34a955c871f607 (patch) | |
| tree | 19c2dcb7fddc96368692be8858ea80dfe20310b8 | |
| parent | 72c784f82c378df1903676acd2efc5eeb5cac579 (diff) | |
| download | linux-c01dd8cf7d19b869af1668c80a34a955c871f607.tar.bz2 | |
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>
| -rw-r--r-- | arch/x86/kernel/pci-base_32.c | 1 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping.h | 12 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping_32.h | 6 | ||||
| -rw-r--r-- | include/asm-x86/dma-mapping_64.h | 11 |
4 files changed, 13 insertions, 17 deletions
diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c index 920530438d8c..dce03c81bb25 100644 --- a/arch/x86/kernel/pci-base_32.c +++ b/arch/x86/kernel/pci-base_32.c @@ -35,6 +35,7 @@ static const struct dma_mapping_ops pci32_dma_ops = { .unmap_single = NULL, .map_sg = pci32_dma_map_sg, .unmap_sg = NULL, + .sync_single_for_cpu = NULL, }; const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; 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, if (dma_ops->unmap_sg) dma_ops->unmap_sg(hwdev, sg, nents, direction); } + +static inline void +dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle, + size_t size, int direction) +{ + BUG_ON(!valid_dma_direction(direction)); + if (dma_ops->sync_single_for_cpu) + dma_ops->sync_single_for_cpu(hwdev, dma_handle, size, + direction); + flush_write_buffers(); +} + #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, } static inline void -dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size, - enum dma_data_direction direction) -{ -} - -static inline void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction direction) { 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, #define dma_unmap_page dma_unmap_single static inline void -dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle, - size_t size, int direction) -{ - BUG_ON(!valid_dma_direction(direction)); - if (dma_ops->sync_single_for_cpu) - dma_ops->sync_single_for_cpu(hwdev, dma_handle, size, - direction); - flush_write_buffers(); -} - -static inline void dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle, size_t size, int direction) { |