MIPS: Replace setup_irq() by request_irq()

[sfrench/cifs-2.6.git] / arch / mips / lasat / interrupt.c

diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index 0f3a8975081d191ead26ee523581c696e18958a4..7965bbd0d319d580626dacfacf65d2ca49c50836 100644 (file)
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -90,14 +90,9 @@ asmlinkage void plat_irq_dispatch(void)
        }
 }
 
-static struct irqaction cascade = {
-       .handler        = no_action,
-       .name           = "cascade",
-       .flags          = IRQF_NO_THREAD,
-};
-
 void __init arch_init_irq(void)
 {
+       int irq = LASAT_CASCADE_IRQ;
        int i;
 
        if (IS_LASAT_200()) {
@@ -119,5 +114,6 @@ void __init arch_init_irq(void)
        for (i = LASAT_IRQ_BASE; i <= LASAT_IRQ_END; i++)
                irq_set_chip_and_handler(i, &lasat_irq_type, handle_level_irq);
 
-       setup_irq(LASAT_CASCADE_IRQ, &cascade);
+       if (request_irq(irq, no_action, IRQF_NO_THREAD, "cascade", NULL))
+               pr_err("Failed to request irq %d (cascade)\n", irq);
 }