arm: Fold irq_set_chip/irq_set_handler

[deliverable/linux.git] / arch / arm / mach-shark / irq.c

diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c
index 2e6da5fe18597ed976415fb27b1b2a730df95cfd..5dce13e429f3daae015b7f5e3b1ddbd27650de48 100644 (file)
--- a/arch/arm/mach-shark/irq.c
+++ b/arch/arm/mach-shark/irq.c
@@ -80,8 +80,7 @@ void __init shark_init_irq(void)
        int irq;
 
        for (irq = 0; irq < NR_IRQS; irq++) {
-               irq_set_chip(irq, &fb_chip);
-               irq_set_handler(irq, handle_edge_irq);
+               irq_set_chip_and_handler(irq, &fb_chip, handle_edge_irq);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }