From mboxrd@z Thu Jan 1 00:00:00 1970 From: thomas.abraham@linaro.org (Thomas Abraham) Date: Wed, 22 Feb 2012 17:44:17 +0530 Subject: [PATCH v3 3/4] ARM: Exynos4: Remove arch_initcall for wakeup interrupt initialization In-Reply-To: <1329912858-32750-1-git-send-email-thomas.abraham@linaro.org> References: <1329912858-32750-1-git-send-email-thomas.abraham@linaro.org> Message-ID: <1329912858-32750-4-git-send-email-thomas.abraham@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The of_irq_init function would be setup to invoke the exynos4_init_irq_eint function when booting using device tree. The arch_initcall for exynos4_init_irq_eint would duplicate its invocation in that case. Hence, arch_initcall for exynos4_init_irq_eint is removed and this function is invoked from the exynos4_init_irq for non-dt case. Moreover, with single kernel image build, the exynos4_init_irq_eint has no checks to ensure that it is running on a exynos4 platform. So it would be appropriate to invoke it from exynos4_init_irq. Signed-off-by: Thomas Abraham --- arch/arm/mach-exynos/common.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index ed50185..888e703 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c @@ -81,6 +81,8 @@ static struct cpu_table cpu_ids[] __initdata = { }, }; +static int exynos4_init_irq_eint(void); + /* Initial IO mappings */ static struct map_desc exynos_iodesc[] __initdata = { @@ -485,6 +487,7 @@ void __init exynos4_init_irq(void) * uses GIC instead of VIC. */ s5p_init_irq(NULL, 0); + exynos4_init_irq_eint(); } struct bus_type exynos4_subsys = { @@ -775,4 +778,3 @@ static int __init exynos4_init_irq_eint(void) irq_set_handler_data(IRQ_EINT16_31, &eint_data); return 0; } -arch_initcall(exynos4_init_irq_eint); -- 1.6.6.rc2