Browse Source

powerpc: platforms/8xx irq_data conversion.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Lennert Buytenhek 14 năm trước cách đây
mục cha
commit
cfe4a10994

+ 7 - 2
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)
 static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
 {
 {
+	struct irq_chip *chip;
 	int cascade_irq;
 	int cascade_irq;
 
 
 	if ((cascade_irq = cpm_get_irq()) >= 0) {
 	if ((cascade_irq = cpm_get_irq()) >= 0) {
 		struct irq_desc *cdesc = irq_to_desc(cascade_irq);
 		struct irq_desc *cdesc = irq_to_desc(cascade_irq);
 
 
 		generic_handle_irq(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
 /* Initialize the internal interrupt controllers.  The number of