[patch 19/20] powerpc/85xx: Prepare cascade handlers for irq argument removal

Thomas Gleixner tglx at linutronix.de
Tue Jul 14 06:50:29 AEST 2015

The irq argument of most interrupt flow handlers is unused or merily
used instead of a local variable. The handlers which need the irq
argument can retrieve the irq number from the irq descriptor.

Search and update was done with coccinelle and the invaluable help of
Julia Lawall.

Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: Julia Lawall <Julia.Lawall at lip6.fr>
Cc: Jiang Liu <jiang.liu at linux.intel.com>
 arch/powerpc/platforms/85xx/mpc85xx_cds.c       |    3 ++-
 arch/powerpc/platforms/85xx/socrates_fpga_pic.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Index: tip/arch/powerpc/platforms/85xx/mpc85xx_cds.c
--- tip.orig/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ tip/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -192,9 +192,10 @@ void mpc85xx_cds_fixup_bus(struct pci_bu
 #ifdef CONFIG_PPC_I8259
-static void mpc85xx_8259_cascade_handler(unsigned int irq,
+static void mpc85xx_8259_cascade_handler(unsigned int __irq,
 					 struct irq_desc *desc)
+	unsigned int irq = irq_desc_get_irq(desc);
 	unsigned int cascade_irq = i8259_irq();
 	if (cascade_irq != NO_IRQ)
Index: tip/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
--- tip.orig/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ tip/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -91,8 +91,9 @@ static inline unsigned int socrates_fpga
-void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
+void socrates_fpga_pic_cascade(unsigned int __irq, struct irq_desc *desc)
+	unsigned int irq = irq_desc_get_irq(desc);
 	struct irq_chip *chip = irq_desc_get_chip(desc);
 	unsigned int cascade_irq;

More information about the Linuxppc-dev mailing list