ARM: msm: Remove init_irq declaration in machine description
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Tue, 14 May 2013 15:38:47 +0000 (17:38 +0200)
committerDavid Brown <davidb@codeaurora.org>
Wed, 15 May 2013 17:11:01 +0000 (10:11 -0700)
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for msm as well.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
arch/arm/mach-msm/board-dt-8660.c
arch/arm/mach-msm/board-dt-8960.c

index 7dcfc5300bbd2e6a8345d73899f7b74d4568825e..492f5cd87b0a74d7ba3fd02545adf7a7297f656b 100644 (file)
@@ -11,7 +11,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/irqchip.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 
@@ -44,7 +43,6 @@ static const char *msm8x60_fluid_match[] __initdata = {
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
        .smp = smp_ops(msm_smp_ops),
        .map_io = msm_map_msm8x60_io,
-       .init_irq = irqchip_init,
        .init_machine = msm8x60_dt_init,
        .init_late = msm8x60_init_late,
        .init_time      = msm_dt_timer_init,
index 73019363ffa4db099ea801a85fe7a9d8a4b0b3ff..bb5530957c4fcfd4d0fc0086d3b162ff69438644 100644 (file)
@@ -11,7 +11,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/irqchip.h>
 #include <linux/of_platform.h>
 
 #include <asm/mach/arch.h>
@@ -31,7 +30,6 @@ static const char * const msm8960_dt_match[] __initconst = {
 DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
        .smp = smp_ops(msm_smp_ops),
        .map_io = msm_map_msm8960_io,
-       .init_irq = irqchip_init,
        .init_time      = msm_dt_timer_init,
        .init_machine = msm_dt_init,
        .dt_compat = msm8960_dt_match,