From 6842b9299272a9471a7e94e046b953f6ffe3db9d Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 4 Jan 2006 15:17:08 +0000 Subject: [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 --- arch/arm/kernel/dma.c | 6 ++++-- arch/arm/kernel/irq.c | 2 -- 2 files changed, 4 insertions(+), 4 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) return ret; } -void __init init_dma(void) +static int __init init_dma(void) { arch_dma_init(dma_chan); + return 0; } +core_initcall(init_dma); + #else int request_dma(dmach_t channel, const char *device_id) @@ -276,7 +279,6 @@ GLOBAL_ALIAS(set_dma_count, get_dma_residue); GLOBAL_ALIAS(__set_dma_addr, get_dma_residue); GLOBAL_ALIAS(set_dma_sg, get_dma_residue); GLOBAL_ALIAS(set_dma_speed, get_dma_residue); -GLOBAL_ALIAS(init_dma, get_dma_residue); #endif diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index d7099dbbb879..869c466e6258 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -1027,7 +1027,6 @@ void __init init_irq_proc(void) void __init init_IRQ(void) { struct irqdesc *desc; - extern void init_dma(void); int irq; #ifdef CONFIG_SMP @@ -1041,7 +1040,6 @@ void __init init_IRQ(void) } init_arch_irq(); - init_dma(); } static int __init noirqdebug_setup(char *str) -- cgit v1.2.2