evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

irqchip: armada-370-xp: Convert to handle_domain_irq

Browse source 
Use the new handle_domain_irq method to handle interrupts.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Link: https://lkml.kernel.org/r/1409047421-27649-7-git-send-email-marc.zyngier@arm.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Marc Zyngier 2014-08-26 11:03:21 +01:00 • committed by Jason Cooper
parent 60031b4ef4
commit e89c6a06b8
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/irqchip/irq-armada-370-xp.c
View file

@ -393,13 +393,15 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained)
if (!(msimask & BIT(msinr))) if (!(msimask & BIT(msinr)))
continue; continue;
if (is_chained) {
irq = irq_find_mapping(armada_370_xp_msi_domain, irq = irq_find_mapping(armada_370_xp_msi_domain,
msinr - 16); msinr - 16);
if (is_chained)
generic_handle_irq(irq); generic_handle_irq(irq);
else } else {
handle_IRQ(irq, regs); irq = msinr - 16;
handle_domain_irq(armada_370_xp_msi_domain,
irq, regs);
}
} }
} }
#else #else
@ -444,9 +446,8 @@ armada_370_xp_handle_irq(struct pt_regs *regs)
break; break;
if (irqnr > 1) { if (irqnr > 1) {
irqnr = irq_find_mapping(armada_370_xp_mpic_domain, handle_domain_irq(armada_370_xp_mpic_domain,
irqnr); irqnr, regs);
handle_IRQ(irqnr, regs);
continue; continue;
} }