| Message ID | 1368438253-28218-9-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, May 13, 2013 at 11:44:07AM +0200, Maxime Ripard wrote: > 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> > --- > arch/arm/mach-msm/board-dt-8660.c | 1 - > arch/arm/mach-msm/board-dt-8960.c | 1 - > 2 files changed, 2 deletions(-) I'll pull this into my msm-cleanup tree. David
Hi David, Le 13/05/2013 20:26, David Brown a écrit : > On Mon, May 13, 2013 at 11:44:07AM +0200, Maxime Ripard wrote: >> 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> >> --- >> arch/arm/mach-msm/board-dt-8660.c | 1 - >> arch/arm/mach-msm/board-dt-8960.c | 1 - >> 2 files changed, 2 deletions(-) > > I'll pull this into my msm-cleanup tree. Like I said in other mails from this thread, I'll send a v2, so you might want to hold off this patch until then. Thanks! Maxime
diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c index 7dcfc53..1360226 100644 --- a/arch/arm/mach-msm/board-dt-8660.c +++ b/arch/arm/mach-msm/board-dt-8660.c @@ -44,7 +44,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, diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c index 7301936..1e8eb1d 100644 --- a/arch/arm/mach-msm/board-dt-8960.c +++ b/arch/arm/mach-msm/board-dt-8960.c @@ -31,7 +31,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,
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> --- arch/arm/mach-msm/board-dt-8660.c | 1 - arch/arm/mach-msm/board-dt-8960.c | 1 - 2 files changed, 2 deletions(-)