From b0a6876f7a61793d04acb9d59b57133f4396387d Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 30 Sep 2008 11:30:24 +0100 Subject: [PATCH] --- yaml --- r: 112309 b: refs/heads/master c: 7807c6098a716567fe408775c1c1999467088305 h: refs/heads/master i: 112307: c1f599bb5201d1b516d70c0ac4f4614dca890eec v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/dma-mapping.h | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index df243f465cbe..601c9266dda2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 309dbbabee7b19e003e1ba4b98f43d28f390a84e +refs/heads/master: 7807c6098a716567fe408775c1c1999467088305 diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h index ad62020763f1..1cb8602dd9d5 100644 --- a/trunk/arch/arm/include/asm/dma-mapping.h +++ b/trunk/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, * or written back. * * The device owns this memory once this call has completed. The CPU - * can regain ownership by calling dma_unmap_page() or - * dma_sync_single_for_cpu(). + * can regain ownership by calling dma_unmap_page(). */ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, 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, * dma_unmap_single - unmap a single buffer previously mapped * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices * @handle: DMA address of buffer - * @size: size of buffer to map - * @dir: DMA transfer direction + * @size: size of buffer (same as passed to dma_map_single) + * @dir: DMA transfer direction (same as passed to dma_map_single) * * Unmap a single streaming mode DMA translation. The handle and size * 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, * dma_unmap_page - unmap a buffer previously mapped through dma_map_page() * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices * @handle: DMA address of buffer - * @size: size of buffer to map - * @dir: DMA transfer direction + * @size: size of buffer (same as passed to dma_map_page) + * @dir: DMA transfer direction (same as passed to dma_map_page) * - * Unmap a single streaming mode DMA translation. The handle and size - * must match what was provided in the previous dma_map_single() call. + * Unmap a page streaming mode DMA translation. The handle and size + * must match what was provided in the previous dma_map_page() call. * All other usages are undefined. * * After this call, reads by the CPU to the buffer are guaranteed to see