Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / drivers / irqchip / irq-sirfsoc.c

diff --git a/drivers/irqchip/irq-sirfsoc.c b/drivers/irqchip/irq-sirfsoc.c
index 5e54f6d71e777c937f8f97185e3ef7ec790cfbb2..a469355df352723cc415753c4e4ec7111c51d3ff 100644 (file)
--- a/drivers/irqchip/irq-sirfsoc.c
+++ b/drivers/irqchip/irq-sirfsoc.c
@@ -50,12 +50,10 @@ sirfsoc_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
 static void __exception_irq_entry sirfsoc_handle_irq(struct pt_regs *regs)
 {
        void __iomem *base = sirfsoc_irqdomain->host_data;
-       u32 irqstat, irqnr;
+       u32 irqstat;
 
        irqstat = readl_relaxed(base + SIRFSOC_INIT_IRQ_ID);
-       irqnr = irq_find_mapping(sirfsoc_irqdomain, irqstat & 0xff);
-
-       handle_IRQ(irqnr, regs);
+       handle_domain_irq(sirfsoc_irqdomain, irqstat & 0xff, regs);
 }
 
 static int __init sirfsoc_irq_init(struct device_node *np,