[ARM] Use core_initcall() to initialise ARM DMA (6842b929) · Commits · 戴 / test

arch/arm/kernel/dma.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)