| Message ID | 1368438253-28218-10-git-send-email-maxime.ripard@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 13, 2013 at 11:44:08AM +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 mvebu as well. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/mach-mvebu/armada-370-xp.c | 1 - > 1 file changed, 1 deletion(-) Maxime, Do do want the individual submaintainers to take these? Or, send one branch to Arnd and Olof? I'm fine with either one as any merge conflicts should be trivial. In either case, Acked-by: Jason Cooper <jason@lakedaemon.net> thx, Jason.
Hi Jason, Le 13/05/2013 17:19, Jason Cooper a écrit : > On Mon, May 13, 2013 at 11:44:08AM +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 mvebu as well. >> >> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >> --- >> arch/arm/mach-mvebu/armada-370-xp.c | 1 - >> 1 file changed, 1 deletion(-) > > Maxime, > > Do do want the individual submaintainers to take these? Or, send one > branch to Arnd and Olof? I'm fine with either one as any merge > conflicts should be trivial. I don't have a strong opinion on this one, I guess both will be fine. Arnd, Olof, what do you prefer? I'll probably have to send a v2 anyway, I forgot to remove the include of the irqchip headers. Maxime
On Mon, May 13, 2013 at 8:53 AM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Hi Jason, > > Le 13/05/2013 17:19, Jason Cooper a écrit : >> On Mon, May 13, 2013 at 11:44:08AM +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 mvebu as well. >>> >>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >>> --- >>> arch/arm/mach-mvebu/armada-370-xp.c | 1 - >>> 1 file changed, 1 deletion(-) >> >> Maxime, >> >> Do do want the individual submaintainers to take these? Or, send one >> branch to Arnd and Olof? I'm fine with either one as any merge >> conflicts should be trivial. > > I don't have a strong opinion on this one, I guess both will be fine. > Arnd, Olof, what do you prefer? > > I'll probably have to send a v2 anyway, I forgot to remove the include > of the irqchip headers. Since each and every patch applies cleanly and things work well both before and after, let's have each maintainer that is active apply their own. If there are platforms that don't have a significant number of patches, i.e. if they're not collecting a branch, then we can apply those. Please follow up with us with the stragglers, I'll assume the rest will come in through the respective maintainers. -Olof
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 42a4cb3..8500002 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c @@ -96,7 +96,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") .init_machine = armada_370_xp_dt_init, .map_io = armada_370_xp_map_io, .init_early = armada_370_xp_init_early, - .init_irq = irqchip_init, .init_time = armada_370_xp_timer_and_clk_init, .restart = mvebu_restart, .dt_compat = armada_370_xp_dt_compat,
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 mvebu as well. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/mach-mvebu/armada-370-xp.c | 1 - 1 file changed, 1 deletion(-)