Merge remote-tracking branch 'lsk/v3.10/topic/clk-divider' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / arch / arm / common / locomo.c

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index ea18b351f205978f32298a45824b6e8586cfc12a..b55c3625d7ee2befcbbfff8caa6ca0ed078f92ea 100644 (file)
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -203,9 +203,8 @@ static void locomo_setup_irq(struct locomo *lchip)
 
        /* Install handlers for IRQ_LOCOMO_* */
        for ( ; irq <= lchip->irq_base + 3; irq++) {
-               irq_set_chip(irq, &locomo_chip);
+               irq_set_chip_and_handler(irq, &locomo_chip, handle_level_irq);
                irq_set_chip_data(irq, lchip);
-               irq_set_handler(irq, handle_level_irq);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
 }