diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-13 22:38:38 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-27 13:36:37 +0200 |
| commit | bdf76e36765970c64624d32150b656dc6669ddc2 (patch) | |
| tree | 6327aa2dcbb57bee4ac2f01bbb8f71de956f8db5 /arch/c6x | |
| parent | blackfin/irq: Use irq_set_handler_locked() (diff) | |
| download | linux-bdf76e36765970c64624d32150b656dc6669ddc2.tar.xz linux-bdf76e36765970c64624d32150b656dc6669ddc2.zip | |
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.
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: linux-c6x-dev@linux-c6x.org
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Link: http://lkml.kernel.org/r/20150713130429.697731509@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/c6x')
| -rw-r--r-- | arch/c6x/platforms/megamod-pic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/c6x/platforms/megamod-pic.c b/arch/c6x/platforms/megamod-pic.c index 74e3371eb824..349bc01fc76c 100644 --- a/arch/c6x/platforms/megamod-pic.c +++ b/arch/c6x/platforms/megamod-pic.c @@ -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 */ |