Merge branch 'pxa-all' into devel

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mach-h720x / common.c

diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c
index 3a410e3..7a26148 100644 (file)
--- a/arch/arm/mach-h720x/common.c
+++ b/arch/arm/mach-h720x/common.c
@@ -104,14 +104,12 @@ h720x_gpio_handler(unsigned int mask, unsigned int irq,
                  struct irq_desc *desc)
 {
        IRQDBG("%s irq: %d\n", __func__, irq);
-       desc = irq_desc + irq;
        while (mask) {
                if (mask & 1) {
                        IRQDBG("handling irq %d\n", irq);
-                       desc_handle_irq(irq, desc);
+                       generic_handle_irq(irq);
                }
                irq++;
-               desc++;
                mask >>= 1;
        }
 }