blob: 686b432e0d363bc4ff4202b260a9e05f117b7666 [file] [log] [blame]
From dhobsong@igel.co.jp Mon Oct 29 00:53:45 2012
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Mon, 29 Oct 2012 16:51:04 +0900
Subject: [PATCH v2 47/58] driver core: fix some kernel-doc warnings in dma*.c
To: greg@kroah.com, laurent.pinchart@ideasonboard.com, horms@verge.net.au
Cc: ltsi-dev@lists.linuxfoundation.org, dhobsong@igel.co.jp
Message-ID: <1351497075-32717-48-git-send-email-dhobsong@igel.co.jp>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix kernel-doc warnings in drivers/base/dma*.c:
Warning(drivers/base/dma-buf.c:498): No description found for parameter 'vaddr'
Warning(drivers/base/dma-coherent.c:199): No description found for parameter 'ret'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 6e7b4a59b3d7bb2dcd11c019354bf0c91037dadd)
Conflicts:
drivers/base/dma-buf.c
Backported patch only addresses dma-coherent.c warning, as dma-buf.c warning is
not present in 3.4 kernel.
Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
---
drivers/base/dma-coherent.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c
index 1b85949..560a717 100644
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
@@ -186,6 +186,7 @@ EXPORT_SYMBOL(dma_release_from_coherent);
* @vma: vm_area for the userspace memory
* @vaddr: cpu address returned by dma_alloc_from_coherent
* @size: size of the memory buffer allocated by dma_alloc_from_coherent
+ * @ret: result from remap_pfn_range()
*
* This checks whether the memory was allocated from the per-device
* coherent memory pool and if so, maps that memory to the provided vma.
--
1.7.5.4