Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[~andy/linux] / drivers / base / dma-buf.c

diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index 20258e179211c667eb8152d715dec9a11d5bed89..24e88fe29ec19801f627e55b7b454fbbe8268181 100644 (file)
--- a/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@ -312,7 +312,7 @@ EXPORT_SYMBOL_GPL(dma_buf_unmap_attachment);
  * cpu in the kernel context. Calls begin_cpu_access to allow exporter-specific
  * preparations. Coherency is only guaranteed in the specified range for the
  * specified access direction.
- * @dma_buf:   [in]    buffer to prepare cpu access for.
+ * @dmabuf:    [in]    buffer to prepare cpu access for.
  * @start:     [in]    start of range for cpu access.
  * @len:       [in]    length of range for cpu access.
  * @direction: [in]    length of range for cpu access.
@@ -339,7 +339,7 @@ EXPORT_SYMBOL_GPL(dma_buf_begin_cpu_access);
  * cpu in the kernel context. Calls end_cpu_access to allow exporter-specific
  * actions. Coherency is only guaranteed in the specified range for the
  * specified access direction.
- * @dma_buf:   [in]    buffer to complete cpu access for.
+ * @dmabuf:    [in]    buffer to complete cpu access for.
  * @start:     [in]    start of range for cpu access.
  * @len:       [in]    length of range for cpu access.
  * @direction: [in]    length of range for cpu access.
@@ -359,7 +359,7 @@ EXPORT_SYMBOL_GPL(dma_buf_end_cpu_access);
 /**
  * dma_buf_kmap_atomic - Map a page of the buffer object into kernel address
  * space. The same restrictions as for kmap_atomic and friends apply.
- * @dma_buf:   [in]    buffer to map page from.
+ * @dmabuf:    [in]    buffer to map page from.
  * @page_num:  [in]    page in PAGE_SIZE units to map.
  *
  * This call must always succeed, any necessary preparations that might fail
@@ -375,7 +375,7 @@ EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
 
 /**
  * dma_buf_kunmap_atomic - Unmap a page obtained by dma_buf_kmap_atomic.
- * @dma_buf:   [in]    buffer to unmap page from.
+ * @dmabuf:    [in]    buffer to unmap page from.
  * @page_num:  [in]    page in PAGE_SIZE units to unmap.
  * @vaddr:     [in]    kernel space pointer obtained from dma_buf_kmap_atomic.
  *
@@ -394,7 +394,7 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
 /**
  * dma_buf_kmap - Map a page of the buffer object into kernel address space. The
  * same restrictions as for kmap and friends apply.
- * @dma_buf:   [in]    buffer to map page from.
+ * @dmabuf:    [in]    buffer to map page from.
  * @page_num:  [in]    page in PAGE_SIZE units to map.
  *
  * This call must always succeed, any necessary preparations that might fail
@@ -410,7 +410,7 @@ EXPORT_SYMBOL_GPL(dma_buf_kmap);
 
 /**
  * dma_buf_kunmap - Unmap a page obtained by dma_buf_kmap.
- * @dma_buf:   [in]    buffer to unmap page from.
+ * @dmabuf:    [in]    buffer to unmap page from.
  * @page_num:  [in]    page in PAGE_SIZE units to unmap.
  * @vaddr:     [in]    kernel space pointer obtained from dma_buf_kmap.
  *