aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/dma.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-04 10:17:08 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-04 10:17:08 -0500
commit6842b9299272a9471a7e94e046b953f6ffe3db9d (patch)
treec24433e5f574b7fa70b9f01cbea01544631c6517 /arch/arm/kernel/dma.c
parent7cdad482974792419cfe4b0affca689170116f49 (diff)
[ARM] Use core_initcall() to initialise ARM DMA
There's no need to have DMA initialised at the same time as interrupts. Move it to a core_initcall(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/dma.c')
-rw-r--r--arch/arm/kernel/dma.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c
index 913fd947528c..3b325ef55a28 100644
--- a/arch/arm/kernel/dma.c
+++ b/arch/arm/kernel/dma.c
@@ -248,11 +248,14 @@ int get_dma_residue(dmach_t channel)
248 return ret; 248 return ret;
249} 249}
250 250
251void __init init_dma(void) 251static int __init init_dma(void)
252{ 252{
253 arch_dma_init(dma_chan); 253 arch_dma_init(dma_chan);
254 return 0;
254} 255}
255 256
257core_initcall(init_dma);
258
256#else 259#else
257 260
258int request_dma(dmach_t channel, const char *device_id) 261int request_dma(dmach_t channel, const char *device_id)
@@ -276,7 +279,6 @@ GLOBAL_ALIAS(set_dma_count, get_dma_residue);
276GLOBAL_ALIAS(__set_dma_addr, get_dma_residue); 279GLOBAL_ALIAS(__set_dma_addr, get_dma_residue);
277GLOBAL_ALIAS(set_dma_sg, get_dma_residue); 280GLOBAL_ALIAS(set_dma_sg, get_dma_residue);
278GLOBAL_ALIAS(set_dma_speed, get_dma_residue); 281GLOBAL_ALIAS(set_dma_speed, get_dma_residue);
279GLOBAL_ALIAS(init_dma, get_dma_residue);
280 282
281#endif 283#endif
282 284