From 2d47857478cea421fd1df6c5b92cbad30ed4de60 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 3 Oct 2006 01:13:50 -0700
Subject: [PATCH] --- yaml --- r: 38003 b: refs/heads/master c:
 eed34d0fc5e4b89269053ed855ef714edbcf4518 h: refs/heads/master i:   38001:
 ca0535a117e588450de0d70898a2029ded4aeee4   37999:
 32832e8549403959121743398e7ea667bb95a75e v: v3

---
 [refs]                                      |  2 +-
 trunk/Documentation/DocBook/kernel-api.tmpl |  4 ++++
 trunk/include/asm-i386/mca_dma.h            |  3 +--
 trunk/kernel/dma.c                          | 10 +++++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 25cb87062a9b..6efef1ea581a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3717bdf8f08a0e1039158c8bab2c24d20f492b6
+refs/heads/master: eed34d0fc5e4b89269053ed855ef714edbcf4518
diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl
index 6d4b1ef5b6f1..83b601b963c5 100644
--- a/trunk/Documentation/DocBook/kernel-api.tmpl
+++ b/trunk/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 --git a/trunk/include/asm-i386/mca_dma.h b/trunk/include/asm-i386/mca_dma.h
index 4b3b526c5a3f..fbb1f3b71279 100644
--- a/trunk/include/asm-i386/mca_dma.h
+++ b/trunk/include/asm-i386/mca_dma.h
@@ -181,7 +181,7 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr)
  *	@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(unsigned int dmanr, unsigned int io_addr)
  *	%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 --git a/trunk/kernel/dma.c b/trunk/kernel/dma.c
index aef0a45b7893..2020644c938a 100644
--- a/trunk/kernel/dma.c
+++ b/trunk/kernel/dma.c
@@ -62,6 +62,11 @@ static struct dma_chan dma_chan_busy[MAX_DMA_CHANNELS] = {
 };
 
 
+/**
+ * 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, const char * device_id)
 	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) {