Commit eed34d0f authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] kernel-doc for kernel/dma.c

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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d3717bdf
...@@ -325,6 +325,10 @@ X!Ekernel/module.c ...@@ -325,6 +325,10 @@ X!Ekernel/module.c
!Ekernel/irq/manage.c !Ekernel/irq/manage.c
</sect1> </sect1>
<sect1><title>DMA Channels</title>
!Ekernel/dma.c
</sect1>
<sect1><title>Resources Management</title> <sect1><title>Resources Management</title>
!Ikernel/resource.c !Ikernel/resource.c
</sect1> </sect1>
......
...@@ -181,7 +181,7 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr) ...@@ -181,7 +181,7 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr)
* @mode: mode to set * @mode: mode to set
* *
* The DMA controller supports several modes. The mode values you can * 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. * %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) ...@@ -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_IO to do DMA to or from an I/O port.
* *
* %MCA_DMA_MODE_16 to do 16bit transfers. * %MCA_DMA_MODE_16 to do 16bit transfers.
*
*/ */
static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode) static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode)
......
...@@ -62,6 +62,11 @@ static struct dma_chan dma_chan_busy[MAX_DMA_CHANNELS] = { ...@@ -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) int request_dma(unsigned int dmanr, const char * device_id)
{ {
if (dmanr >= MAX_DMA_CHANNELS) if (dmanr >= MAX_DMA_CHANNELS)
...@@ -76,7 +81,10 @@ int request_dma(unsigned int dmanr, const char * device_id) ...@@ -76,7 +81,10 @@ int request_dma(unsigned int dmanr, const char * device_id)
return 0; return 0;
} /* request_dma */ } /* request_dma */
/**
* free_dma - free a reserved system DMA channel
* @dmanr: DMA channel number
*/
void free_dma(unsigned int dmanr) void free_dma(unsigned int dmanr)
{ {
if (dmanr >= MAX_DMA_CHANNELS) { if (dmanr >= MAX_DMA_CHANNELS) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment