diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-10-13 15:58:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:23:27 -0400 |
commit | dec6d14da8b46e1f8bef6f570fb7418359cefcde (patch) | |
tree | 1f0617d8ae4808b3650113f4fc36da5e3f7a47bb | |
parent | 7ae4833af0dda3bdfb65004856c3f83871fd8ce4 (diff) |
m68k: Add missing dma_sync_single_range_for_{cpu,device}()
| include/linux/ssb/ssb.h: In function 'ssb_dma_sync_single_range_for_cpu':
| include/linux/ssb/ssb.h:517: error: implicit declaration of function 'dma_sync_single_range_for_cpu'
| include/linux/ssb/ssb.h: In function 'ssb_dma_sync_single_range_for_device':
| include/linux/ssb/ssb.h:538: error: implicit declaration of function 'dma_sync_single_range_for_device'
Add the missing dma_sync_single_range_for_{cpu,device}(), and remove the
`inline' for the non-static function dma_sync_single_for_device().
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/m68k/kernel/dma.c | 4 | ||||
-rw-r--r-- | include/asm-m68k/dma-mapping.h | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c index 6f8c080dd9f9..2bb4245404d8 100644 --- a/arch/m68k/kernel/dma.c +++ b/arch/m68k/kernel/dma.c | |||
@@ -66,8 +66,8 @@ void dma_free_coherent(struct device *dev, size_t size, | |||
66 | } | 66 | } |
67 | EXPORT_SYMBOL(dma_free_coherent); | 67 | EXPORT_SYMBOL(dma_free_coherent); |
68 | 68 | ||
69 | inline void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, size_t size, | 69 | void dma_sync_single_for_device(struct device *dev, dma_addr_t handle, |
70 | enum dma_data_direction dir) | 70 | size_t size, enum dma_data_direction dir) |
71 | { | 71 | { |
72 | switch (dir) { | 72 | switch (dir) { |
73 | case DMA_TO_DEVICE: | 73 | case DMA_TO_DEVICE: |
diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h index 91f7944333d4..26f505488c11 100644 --- a/include/asm-m68k/dma-mapping.h +++ b/include/asm-m68k/dma-mapping.h | |||
@@ -74,6 +74,14 @@ extern void dma_sync_single_for_device(struct device *, dma_addr_t, size_t, | |||
74 | extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int, | 74 | extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int, |
75 | enum dma_data_direction); | 75 | enum dma_data_direction); |
76 | 76 | ||
77 | static inline void dma_sync_single_range_for_device(struct device *dev, | ||
78 | dma_addr_t dma_handle, unsigned long offset, size_t size, | ||
79 | enum dma_data_direction direction) | ||
80 | { | ||
81 | /* just sync everything for now */ | ||
82 | dma_sync_single_for_device(dev, dma_handle, offset + size, direction); | ||
83 | } | ||
84 | |||
77 | static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, | 85 | static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, |
78 | size_t size, enum dma_data_direction dir) | 86 | size_t size, enum dma_data_direction dir) |
79 | { | 87 | { |
@@ -84,6 +92,14 @@ static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *s | |||
84 | { | 92 | { |
85 | } | 93 | } |
86 | 94 | ||
95 | static inline void dma_sync_single_range_for_cpu(struct device *dev, | ||
96 | dma_addr_t dma_handle, unsigned long offset, size_t size, | ||
97 | enum dma_data_direction direction) | ||
98 | { | ||
99 | /* just sync everything for now */ | ||
100 | dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction); | ||
101 | } | ||
102 | |||
87 | static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) | 103 | static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) |
88 | { | 104 | { |
89 | return 0; | 105 | return 0; |