diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-05-14 11:38:47 -0400 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2013-05-15 13:11:01 -0400 |
commit | cbef1a01ea7afafced5825a56eb3aeb97ad48828 (patch) | |
tree | ec36b7fbe075dcd662c2e9d826ea7ad03a21af4f | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) |
ARM: msm: Remove init_irq declaration in machine description
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>
-rw-r--r-- | arch/arm/mach-msm/board-dt-8660.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-msm/board-dt-8960.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c index 7dcfc5300bbd..492f5cd87b0a 100644 --- a/arch/arm/mach-msm/board-dt-8660.c +++ b/arch/arm/mach-msm/board-dt-8660.c | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/irqchip.h> | ||
15 | #include <linux/of.h> | 14 | #include <linux/of.h> |
16 | #include <linux/of_platform.h> | 15 | #include <linux/of_platform.h> |
17 | 16 | ||
@@ -44,7 +43,6 @@ static const char *msm8x60_fluid_match[] __initdata = { | |||
44 | DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") | 43 | DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") |
45 | .smp = smp_ops(msm_smp_ops), | 44 | .smp = smp_ops(msm_smp_ops), |
46 | .map_io = msm_map_msm8x60_io, | 45 | .map_io = msm_map_msm8x60_io, |
47 | .init_irq = irqchip_init, | ||
48 | .init_machine = msm8x60_dt_init, | 46 | .init_machine = msm8x60_dt_init, |
49 | .init_late = msm8x60_init_late, | 47 | .init_late = msm8x60_init_late, |
50 | .init_time = msm_dt_timer_init, | 48 | .init_time = msm_dt_timer_init, |
diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c index 73019363ffa4..bb5530957c4f 100644 --- a/arch/arm/mach-msm/board-dt-8960.c +++ b/arch/arm/mach-msm/board-dt-8960.c | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/irqchip.h> | ||
15 | #include <linux/of_platform.h> | 14 | #include <linux/of_platform.h> |
16 | 15 | ||
17 | #include <asm/mach/arch.h> | 16 | #include <asm/mach/arch.h> |
@@ -31,7 +30,6 @@ static const char * const msm8960_dt_match[] __initconst = { | |||
31 | DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)") | 30 | DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)") |
32 | .smp = smp_ops(msm_smp_ops), | 31 | .smp = smp_ops(msm_smp_ops), |
33 | .map_io = msm_map_msm8960_io, | 32 | .map_io = msm_map_msm8960_io, |
34 | .init_irq = irqchip_init, | ||
35 | .init_time = msm_dt_timer_init, | 33 | .init_time = msm_dt_timer_init, |
36 | .init_machine = msm_dt_init, | 34 | .init_machine = msm_dt_init, |
37 | .dt_compat = msm8960_dt_match, | 35 | .dt_compat = msm8960_dt_match, |