diff options
Diffstat (limited to 'arch/sh/include/asm/dma-mapping.h')
-rw-r--r-- | arch/sh/include/asm/dma-mapping.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h index ea9d4f41c9d2..69d56dd4c968 100644 --- a/arch/sh/include/asm/dma-mapping.h +++ b/arch/sh/include/asm/dma-mapping.h | |||
@@ -97,7 +97,7 @@ static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address, | |||
97 | dma_unmap_single(dev, dma_address, size, dir); | 97 | dma_unmap_single(dev, dma_address, size, dir); |
98 | } | 98 | } |
99 | 99 | ||
100 | static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle, | 100 | static inline void __dma_sync_single(struct device *dev, dma_addr_t dma_handle, |
101 | size_t size, enum dma_data_direction dir) | 101 | size_t size, enum dma_data_direction dir) |
102 | { | 102 | { |
103 | #if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT) | 103 | #if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT) |
@@ -119,7 +119,7 @@ static inline void dma_sync_single_range(struct device *dev, | |||
119 | dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir); | 119 | dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir); |
120 | } | 120 | } |
121 | 121 | ||
122 | static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg, | 122 | static inline void __dma_sync_sg(struct device *dev, struct scatterlist *sg, |
123 | int nelems, enum dma_data_direction dir) | 123 | int nelems, enum dma_data_direction dir) |
124 | { | 124 | { |
125 | int i; | 125 | int i; |
@@ -137,7 +137,7 @@ static inline void dma_sync_single_for_cpu(struct device *dev, | |||
137 | dma_addr_t dma_handle, size_t size, | 137 | dma_addr_t dma_handle, size_t size, |
138 | enum dma_data_direction dir) | 138 | enum dma_data_direction dir) |
139 | { | 139 | { |
140 | dma_sync_single(dev, dma_handle, size, dir); | 140 | __dma_sync_single(dev, dma_handle, size, dir); |
141 | debug_dma_sync_single_for_cpu(dev, dma_handle, size, dir); | 141 | debug_dma_sync_single_for_cpu(dev, dma_handle, size, dir); |
142 | } | 142 | } |
143 | 143 | ||
@@ -146,7 +146,7 @@ static inline void dma_sync_single_for_device(struct device *dev, | |||
146 | size_t size, | 146 | size_t size, |
147 | enum dma_data_direction dir) | 147 | enum dma_data_direction dir) |
148 | { | 148 | { |
149 | dma_sync_single(dev, dma_handle, size, dir); | 149 | __dma_sync_single(dev, dma_handle, size, dir); |
150 | debug_dma_sync_single_for_device(dev, dma_handle, size, dir); | 150 | debug_dma_sync_single_for_device(dev, dma_handle, size, dir); |
151 | } | 151 | } |
152 | 152 | ||
@@ -177,7 +177,7 @@ static inline void dma_sync_sg_for_cpu(struct device *dev, | |||
177 | struct scatterlist *sg, int nelems, | 177 | struct scatterlist *sg, int nelems, |
178 | enum dma_data_direction dir) | 178 | enum dma_data_direction dir) |
179 | { | 179 | { |
180 | dma_sync_sg(dev, sg, nelems, dir); | 180 | __dma_sync_sg(dev, sg, nelems, dir); |
181 | debug_dma_sync_sg_for_cpu(dev, sg, nelems, dir); | 181 | debug_dma_sync_sg_for_cpu(dev, sg, nelems, dir); |
182 | } | 182 | } |
183 | 183 | ||
@@ -185,7 +185,7 @@ static inline void dma_sync_sg_for_device(struct device *dev, | |||
185 | struct scatterlist *sg, int nelems, | 185 | struct scatterlist *sg, int nelems, |
186 | enum dma_data_direction dir) | 186 | enum dma_data_direction dir) |
187 | { | 187 | { |
188 | dma_sync_sg(dev, sg, nelems, dir); | 188 | __dma_sync_sg(dev, sg, nelems, dir); |
189 | debug_dma_sync_sg_for_device(dev, sg, nelems, dir); | 189 | debug_dma_sync_sg_for_device(dev, sg, nelems, dir); |
190 | } | 190 | } |
191 | 191 | ||