diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2014-08-26 11:03:21 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-09-03 13:10:30 +0000 |
| commit | e89c6a06b876239161653da84dbb2a0e243768b8 (patch) | |
| tree | 059e029cc65607e934cbed7942dfa07c8b602a5b /drivers/irqchip/irq-armada-370-xp.c | |
| parent | 60031b4ef40b62f6563cc6635f670a144f182b83 (diff) | |
| download | op-kernel-dev-e89c6a06b876239161653da84dbb2a0e243768b8.zip op-kernel-dev-e89c6a06b876239161653da84dbb2a0e243768b8.tar.gz | |
irqchip: armada-370-xp: Convert to handle_domain_irq
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>
Diffstat (limited to 'drivers/irqchip/irq-armada-370-xp.c')
| -rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 574aba0..fa75a29 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -393,13 +393,15 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs *regs, bool is_chained) if (!(msimask & BIT(msinr))) continue; - irq = irq_find_mapping(armada_370_xp_msi_domain, - msinr - 16); - - if (is_chained) + if (is_chained) { + irq = irq_find_mapping(armada_370_xp_msi_domain, + msinr - 16); generic_handle_irq(irq); - else - handle_IRQ(irq, regs); + } else { + irq = msinr - 16; + handle_domain_irq(armada_370_xp_msi_domain, + irq, regs); + } } } #else @@ -444,9 +446,8 @@ armada_370_xp_handle_irq(struct pt_regs *regs) break; if (irqnr > 1) { - irqnr = irq_find_mapping(armada_370_xp_mpic_domain, - irqnr); - handle_IRQ(irqnr, regs); + handle_domain_irq(armada_370_xp_mpic_domain, + irqnr, regs); continue; } |
