The patch titled
kernel-doc for kernel/dma.c
has been removed from the -mm tree. Its filename is
kernel-doc-for-kernel-dmac.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: kernel-doc for kernel/dma.c
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Add kernel-doc function headers in kernel/dma.c and use it in DocBook.
Clean up kernel-doc in mca_dma.h (the colon (':') represents a
section header).
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
Documentation/DocBook/kernel-api.tmpl | 4 ++++
include/asm-i386/mca_dma.h | 3 +--
kernel/dma.c | 10 +++++++++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff -puN Documentation/DocBook/kernel-api.tmpl~kernel-doc-for-kernel-dmac Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl~kernel-doc-for-kernel-dmac
+++ a/Documentation/DocBook/kernel-api.tmpl
@@ -325,6 +325,10 @@ X!Ekernel/module.c
!Ekernel/irq/manage.c
</sect1>
+ <sect1><title>DMA Channels</title>
+!Ekernel/dma.c
+ </sect1>
+
<sect1><title>Resources Management</title>
!Ikernel/resource.c
</sect1>
diff -puN include/asm-i386/mca_dma.h~kernel-doc-for-kernel-dmac include/asm-i386/mca_dma.h
--- a/include/asm-i386/mca_dma.h~kernel-doc-for-kernel-dmac
+++ a/include/asm-i386/mca_dma.h
@@ -181,7 +181,7 @@ static __inline__ void mca_set_dma_io(un
* @mode: mode to set
*
* The DMA controller supports several modes. The mode values you can
- * set are :
+ * set are-
*
* %MCA_DMA_MODE_READ when reading from the DMA device.
*
@@ -190,7 +190,6 @@ static __inline__ void mca_set_dma_io(un
* %MCA_DMA_MODE_IO to do DMA to or from an I/O port.
*
* %MCA_DMA_MODE_16 to do 16bit transfers.
- *
*/
static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode)
diff -puN kernel/dma.c~kernel-doc-for-kernel-dmac kernel/dma.c
--- a/kernel/dma.c~kernel-doc-for-kernel-dmac
+++ a/kernel/dma.c
@@ -62,6 +62,11 @@ static struct dma_chan dma_chan_busy[MAX
};
+/**
+ * request_dma - request and reserve a system DMA channel
+ * @dmanr: DMA channel number
+ * @device_id: reserving device ID string, used in /proc/dma
+ */
int request_dma(unsigned int dmanr, const char * device_id)
{
if (dmanr >= MAX_DMA_CHANNELS)
@@ -76,7 +81,10 @@ int request_dma(unsigned int dmanr, cons
return 0;
} /* request_dma */
-
+/**
+ * free_dma - free a reserved system DMA channel
+ * @dmanr: DMA channel number
+ */
void free_dma(unsigned int dmanr)
{
if (dmanr >= MAX_DMA_CHANNELS) {
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
origin.patch
git-acpi.patch
acpi-fix-printk-format-warnings.patch
pcmcia-ds-must_check-fixes.patch
git-scsi-misc.patch
tiacx-sparse-cleanups.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
