aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-04 10:52:45 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-04 10:52:45 -0500
commitd7b4a75677f8f2a559b0c55a550b364e79a8d302 (patch)
treec349ee283d3bde9489b7eb6c450cca0b8f45c298
parent95ba9fb06be4a8714c98df6097eab1808c72fa98 (diff)
[ARM] Move DMA exports to be next to each function
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/kernel/dma.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c
index 62c8966a8b77..5a0f4bc5da95 100644
--- a/arch/arm/kernel/dma.c
+++ b/arch/arm/kernel/dma.c
@@ -21,6 +21,7 @@
21#include <asm/mach/dma.h> 21#include <asm/mach/dma.h>
22 22
23DEFINE_SPINLOCK(dma_spin_lock); 23DEFINE_SPINLOCK(dma_spin_lock);
24EXPORT_SYMBOL(dma_spin_lock);
24 25
25static dma_t dma_chan[MAX_DMA_CHANNELS]; 26static dma_t dma_chan[MAX_DMA_CHANNELS];
26 27
@@ -77,6 +78,7 @@ bad_dma:
77busy: 78busy:
78 return -EBUSY; 79 return -EBUSY;
79} 80}
81EXPORT_SYMBOL(request_dma);
80 82
81/* 83/*
82 * Free DMA channel 84 * Free DMA channel
@@ -108,6 +110,7 @@ void free_dma(dmach_t channel)
108bad_dma: 110bad_dma:
109 printk(KERN_ERR "dma: trying to free DMA%d\n", channel); 111 printk(KERN_ERR "dma: trying to free DMA%d\n", channel);
110} 112}
113EXPORT_SYMBOL(free_dma);
111 114
112/* Set DMA Scatter-Gather list 115/* Set DMA Scatter-Gather list
113 */ 116 */
@@ -123,6 +126,7 @@ void set_dma_sg (dmach_t channel, struct scatterlist *sg, int nr_sg)
123 dma->sgcount = nr_sg; 126 dma->sgcount = nr_sg;
124 dma->invalid = 1; 127 dma->invalid = 1;
125} 128}
129EXPORT_SYMBOL(set_dma_sg);
126 130
127/* Set DMA address 131/* Set DMA address
128 * 132 *
@@ -140,6 +144,7 @@ void __set_dma_addr (dmach_t channel, void *addr)
140 dma->addr = addr; 144 dma->addr = addr;
141 dma->invalid = 1; 145 dma->invalid = 1;
142} 146}
147EXPORT_SYMBOL(__set_dma_addr);
143 148
144/* Set DMA byte count 149/* Set DMA byte count
145 * 150 *
@@ -157,6 +162,7 @@ void set_dma_count (dmach_t channel, unsigned long count)
157 dma->count = count; 162 dma->count = count;
158 dma->invalid = 1; 163 dma->invalid = 1;
159} 164}
165EXPORT_SYMBOL(set_dma_count);
160 166
161/* Set DMA direction mode 167/* Set DMA direction mode
162 */ 168 */
@@ -171,6 +177,7 @@ void set_dma_mode (dmach_t channel, dmamode_t mode)
171 dma->dma_mode = mode; 177 dma->dma_mode = mode;
172 dma->invalid = 1; 178 dma->invalid = 1;
173} 179}
180EXPORT_SYMBOL(set_dma_mode);
174 181
175/* Enable DMA channel 182/* Enable DMA channel
176 */ 183 */
@@ -191,6 +198,7 @@ free_dma:
191 printk(KERN_ERR "dma%d: trying to enable free DMA\n", channel); 198 printk(KERN_ERR "dma%d: trying to enable free DMA\n", channel);
192 BUG(); 199 BUG();
193} 200}
201EXPORT_SYMBOL(enable_dma);
194 202
195/* Disable DMA channel 203/* Disable DMA channel
196 */ 204 */
@@ -211,6 +219,7 @@ free_dma:
211 printk(KERN_ERR "dma%d: trying to disable free DMA\n", channel); 219 printk(KERN_ERR "dma%d: trying to disable free DMA\n", channel);
212 BUG(); 220 BUG();
213} 221}
222EXPORT_SYMBOL(disable_dma);
214 223
215/* 224/*
216 * Is the specified DMA channel active? 225 * Is the specified DMA channel active?
@@ -224,6 +233,7 @@ void set_dma_page(dmach_t channel, char pagenr)
224{ 233{
225 printk(KERN_ERR "dma%d: trying to set_dma_page\n", channel); 234 printk(KERN_ERR "dma%d: trying to set_dma_page\n", channel);
226} 235}
236EXPORT_SYMBOL(set_dma_page);
227 237
228void set_dma_speed(dmach_t channel, int cycle_ns) 238void set_dma_speed(dmach_t channel, int cycle_ns)
229{ 239{
@@ -234,6 +244,7 @@ void set_dma_speed(dmach_t channel, int cycle_ns)
234 ret = dma->d_ops->setspeed(channel, dma, cycle_ns); 244 ret = dma->d_ops->setspeed(channel, dma, cycle_ns);
235 dma->speed = ret; 245 dma->speed = ret;
236} 246}
247EXPORT_SYMBOL(set_dma_speed);
237 248
238int get_dma_residue(dmach_t channel) 249int get_dma_residue(dmach_t channel)
239{ 250{
@@ -245,6 +256,7 @@ int get_dma_residue(dmach_t channel)
245 256
246 return ret; 257 return ret;
247} 258}
259EXPORT_SYMBOL(get_dma_residue);
248 260
249static int __init init_dma(void) 261static int __init init_dma(void)
250{ 262{
@@ -253,17 +265,3 @@ static int __init init_dma(void)
253} 265}
254 266
255core_initcall(init_dma); 267core_initcall(init_dma);
256
257EXPORT_SYMBOL(request_dma);
258EXPORT_SYMBOL(free_dma);
259EXPORT_SYMBOL(enable_dma);
260EXPORT_SYMBOL(disable_dma);
261EXPORT_SYMBOL(__set_dma_addr);
262EXPORT_SYMBOL(set_dma_count);
263EXPORT_SYMBOL(set_dma_mode);
264EXPORT_SYMBOL(set_dma_page);
265EXPORT_SYMBOL(get_dma_residue);
266EXPORT_SYMBOL(set_dma_sg);
267EXPORT_SYMBOL(set_dma_speed);
268
269EXPORT_SYMBOL(dma_spin_lock);