Skip to contentSkip to conversation

C6X/meagmod-pic: Consolidate chained IRQ handler install/remove

PATCH New Thomas Gleixner 2 participants 2 messages Jul 13, 2015 – Jul 27, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 C6X/meagmod-pic: Consolidate chained IRQ handler install/remove

Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one.

Search and conversion was done with coccinelle.

---
 arch/c6x/platforms/megamod-pic.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/c6x/platforms/megamod-pic.c +2 -2
Index: tip/arch/c6x/platforms/megamod-pic.c
===================================================================
@@ -282,8 +282,8 @@ static struct megamod_pic * __init init_
 		soc_writel(~0, &pic->regs->evtmask[i]);
 		soc_writel(~0, &pic->regs->evtclr[i]);
 
-		irq_set_handler_data(irq, &cascade_data[i]);
-		irq_set_chained_handler(irq, megamod_irq_cascade);
+		irq_set_chained_handler_and_data(irq, megamod_irq_cascade,
+						 &cascade_data[i]);
 	}
 
 	/* Finally, set up the MUX registers */
#1 lore raw
C6X/meagmod-pic: Consolidate chained IRQ handler install/remove
Commit-ID:  bdf76e36765970c64624d32150b656dc6669ddc2
Gitweb:     http://git.kernel.org/tip/bdf76e36765970c64624d32150b656dc6669ddc2
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Mon, 13 Jul 2015 20:38:38 +0000
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 27 Jul 2015 13:36:37 +0200

C6X/meagmod-pic: Consolidate chained IRQ handler install/remove

Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one.

Search and conversion was done with coccinelle.

---
 arch/c6x/platforms/megamod-pic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/c6x/platforms/megamod-pic.c +2 -2
index 74e3371..349bc01 100644
@@ -282,8 +282,8 @@ static struct megamod_pic * __init init_megamod_pic(struct device_node *np)
 		soc_writel(~0, &pic->regs->evtmask[i]);
 		soc_writel(~0, &pic->regs->evtclr[i]);
 
-		irq_set_handler_data(irq, &cascade_data[i]);
-		irq_set_chained_handler(irq, megamod_irq_cascade);
+		irq_set_chained_handler_and_data(irq, megamod_irq_cascade,
+						 &cascade_data[i]);
 	}
 
 	/* Finally, set up the MUX registers */