powerpc: platforms/8xx irq_data conversion.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 60168c1f98feb5bba3126c1f01ca6987fbe27f58..fabb108e874411e7008e18ad51d0db80012bfd29 100644 (file)
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -218,15 +218,20 @@ void mpc8xx_restart(char *cmd)
 
 static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
 {
+       struct irq_chip *chip;
        int cascade_irq;
 
        if ((cascade_irq = cpm_get_irq()) >= 0) {
                struct irq_desc *cdesc = irq_to_desc(cascade_irq);
 
                generic_handle_irq(cascade_irq);
-               cdesc->chip->eoi(cascade_irq);
+
+               chip = get_irq_desc_chip(cdesc);
+               chip->irq_eoi(&cdesc->irq_data);
        }
-       desc->chip->eoi(irq);
+
+       chip = get_irq_desc_chip(desc);
+       chip->irq_eoi(&desc->irq_data);
 }
 
 /* Initialize the internal interrupt controllers.  The number of