aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-09-30 06:30:24 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-30 06:30:53 -0400
commit7807c6098a716567fe408775c1c1999467088305 (patch)
tree0d8a6285084e61904ce5bd7de2f1b148c9ada47f
parent309dbbabee7b19e003e1ba4b98f43d28f390a84e (diff)
[ARM] dma: fix some comments in dma-mapping.h
... to prevent people being mislead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/include/asm/dma-mapping.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index ad62020763f1..1cb8602dd9d5 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -297,8 +297,7 @@ static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,
297 * or written back. 297 * or written back.
298 * 298 *
299 * The device owns this memory once this call has completed. The CPU 299 * The device owns this memory once this call has completed. The CPU
300 * can regain ownership by calling dma_unmap_page() or 300 * can regain ownership by calling dma_unmap_page().
301 * dma_sync_single_for_cpu().
302 */ 301 */
303static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, 302static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
304 unsigned long offset, size_t size, enum dma_data_direction dir) 303 unsigned long offset, size_t size, enum dma_data_direction dir)
@@ -315,8 +314,8 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
315 * dma_unmap_single - unmap a single buffer previously mapped 314 * dma_unmap_single - unmap a single buffer previously mapped
316 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices 315 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
317 * @handle: DMA address of buffer 316 * @handle: DMA address of buffer
318 * @size: size of buffer to map 317 * @size: size of buffer (same as passed to dma_map_single)
319 * @dir: DMA transfer direction 318 * @dir: DMA transfer direction (same as passed to dma_map_single)
320 * 319 *
321 * Unmap a single streaming mode DMA translation. The handle and size 320 * Unmap a single streaming mode DMA translation. The handle and size
322 * must match what was provided in the previous dma_map_single() call. 321 * must match what was provided in the previous dma_map_single() call.
@@ -336,11 +335,11 @@ static inline void dma_unmap_single(struct device *dev, dma_addr_t handle,
336 * dma_unmap_page - unmap a buffer previously mapped through dma_map_page() 335 * dma_unmap_page - unmap a buffer previously mapped through dma_map_page()
337 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices 336 * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
338 * @handle: DMA address of buffer 337 * @handle: DMA address of buffer
339 * @size: size of buffer to map 338 * @size: size of buffer (same as passed to dma_map_page)
340 * @dir: DMA transfer direction 339 * @dir: DMA transfer direction (same as passed to dma_map_page)
341 * 340 *
342 * Unmap a single streaming mode DMA translation. The handle and size 341 * Unmap a page streaming mode DMA translation. The handle and size
343 * must match what was provided in the previous dma_map_single() call. 342 * must match what was provided in the previous dma_map_page() call.
344 * All other usages are undefined. 343 * All other usages are undefined.
345 * 344 *
346 * After this call, reads by the CPU to the buffer are guaranteed to see 345 * After this call, reads by the CPU to the buffer are guaranteed to see