diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2014-08-26 06:03:23 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-09-03 09:10:34 -0400 |
commit | b918402c8092e9f55ad1e848c4264cc0c9ea7513 (patch) | |
tree | d53fd1b111d46e5cf7bfd092c604b21d39a035f1 | |
parent | a8e10cb769eb94277658d3f3bce12e10b5652b7f (diff) |
irqchip: mmp: 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-9-git-send-email-marc.zyngier@arm.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | drivers/irqchip/irq-mmp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c index 1c3e2c9b46ba..c0da57bdb89d 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/drivers/irqchip/irq-mmp.c | |||
@@ -196,26 +196,24 @@ static struct mmp_intc_conf mmp2_conf = { | |||
196 | 196 | ||
197 | static void __exception_irq_entry mmp_handle_irq(struct pt_regs *regs) | 197 | static void __exception_irq_entry mmp_handle_irq(struct pt_regs *regs) |
198 | { | 198 | { |
199 | int irq, hwirq; | 199 | int hwirq; |
200 | 200 | ||
201 | hwirq = readl_relaxed(mmp_icu_base + PJ1_INT_SEL); | 201 | hwirq = readl_relaxed(mmp_icu_base + PJ1_INT_SEL); |
202 | if (!(hwirq & SEL_INT_PENDING)) | 202 | if (!(hwirq & SEL_INT_PENDING)) |
203 | return; | 203 | return; |
204 | hwirq &= SEL_INT_NUM_MASK; | 204 | hwirq &= SEL_INT_NUM_MASK; |
205 | irq = irq_find_mapping(icu_data[0].domain, hwirq); | 205 | handle_domain_irq(icu_data[0].domain, hwirq, regs); |
206 | handle_IRQ(irq, regs); | ||
207 | } | 206 | } |
208 | 207 | ||
209 | static void __exception_irq_entry mmp2_handle_irq(struct pt_regs *regs) | 208 | static void __exception_irq_entry mmp2_handle_irq(struct pt_regs *regs) |
210 | { | 209 | { |
211 | int irq, hwirq; | 210 | int hwirq; |
212 | 211 | ||
213 | hwirq = readl_relaxed(mmp_icu_base + PJ4_INT_SEL); | 212 | hwirq = readl_relaxed(mmp_icu_base + PJ4_INT_SEL); |
214 | if (!(hwirq & SEL_INT_PENDING)) | 213 | if (!(hwirq & SEL_INT_PENDING)) |
215 | return; | 214 | return; |
216 | hwirq &= SEL_INT_NUM_MASK; | 215 | hwirq &= SEL_INT_NUM_MASK; |
217 | irq = irq_find_mapping(icu_data[0].domain, hwirq); | 216 | handle_domain_irq(icu_data[0].domain, hwirq, regs); |
218 | handle_IRQ(irq, regs); | ||
219 | } | 217 | } |
220 | 218 | ||
221 | /* MMP (ARMv5) */ | 219 | /* MMP (ARMv5) */ |