powerpc: Convert to new irq_* function names

[deliverable/linux.git] / arch / powerpc / platforms / 86xx / pic.c

diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c
index 668275d9e668b73f2c99a7577f20c44cbd950f03..8ef8960abda6d53ccd17193ab5722ab700a2d231 100644 (file)
--- a/arch/powerpc/platforms/86xx/pic.c
+++ b/arch/powerpc/platforms/86xx/pic.c
@@ -19,10 +19,13 @@
 #ifdef CONFIG_PPC_I8259
 static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
+       struct irq_chip *chip = irq_desc_get_chip(desc);
        unsigned int cascade_irq = i8259_irq();
+
        if (cascade_irq != NO_IRQ)
                generic_handle_irq(cascade_irq);
-       desc->chip->eoi(irq);
+
+       chip->irq_eoi(&desc->irq_data);
 }
 #endif /* CONFIG_PPC_I8259 */
 
@@ -74,6 +77,6 @@ void __init mpc86xx_init_irq(void)
        i8259_init(cascade_node, 0);
        of_node_put(cascade_node);
 
-       set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);
+       irq_set_chained_handler(cascade_irq, mpc86xx_8259_cascade);
 #endif
 }