Merge tag 'for-linus-20141015' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / drivers / irqchip / irq-s3c24xx.c

diff --git a/drivers/irqchip/irq-s3c24xx.c b/drivers/irqchip/irq-s3c24xx.c
index 78a6acc..c8d373f 100644 (file)
--- a/drivers/irqchip/irq-s3c24xx.c
+++ b/drivers/irqchip/irq-s3c24xx.c
@@ -339,7 +339,6 @@ static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc,
 {
        int pnd;
        int offset;
-       int irq;
 
        pnd = __raw_readl(intc->reg_intpnd);
        if (!pnd)
@@ -365,8 +364,7 @@ static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc,
        if (!(pnd & (1 << offset)))
                offset =  __ffs(pnd);
 
-       irq = irq_find_mapping(intc->domain, intc_offset + offset);
-       handle_IRQ(irq, regs);
+       handle_domain_irq(intc->domain, intc_offset + offset, regs);
        return true;
 }