Messages in this thread Patch in this message | | | Date | Mon, 13 Jul 2015 20:51:26 -0000 | From | Thomas Gleixner <> | Subject | [patch 5/5] sh/intc: Prepare irq flow handlers for irq argument removal |
| |
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@linutronix.de> Cc: Julia Lawall <Julia.Lawall@lip6.fr> Cc: Jiang Liu <jiang.liu@linux.intel.com> Cc: Simon Horman <horms@verge.net.au> Cc: Magnus Damm <magnus.damm@gmail.com>
--- arch/sh/boards/mach-se/7724/irq.c | 3 ++- drivers/sh/intc/virq.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
Index: tip/arch/sh/boards/mach-se/7724/irq.c =================================================================== --- tip.orig/arch/sh/boards/mach-se/7724/irq.c +++ tip/arch/sh/boards/mach-se/7724/irq.c @@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip _ .irq_unmask = enable_se7724_irq, }; -static void se7724_irq_demux(unsigned int irq, struct irq_desc *desc) +static void se7724_irq_demux(unsigned int __irq, struct irq_desc *desc) { + unsigned int irq = irq_desc_get_irq(desc); struct fpga_irq set = get_fpga_irq(irq); unsigned short intv = __raw_readw(set.sraddr); unsigned int ext_irq = set.base; Index: tip/drivers/sh/intc/virq.c =================================================================== --- tip.orig/drivers/sh/intc/virq.c +++ tip/drivers/sh/intc/virq.c @@ -109,8 +109,9 @@ static int add_virq_to_pirq(unsigned int return 0; } -static void intc_virq_handler(unsigned int irq, struct irq_desc *desc) +static void intc_virq_handler(unsigned int __irq, struct irq_desc *desc) { + unsigned int irq = irq_desc_get_irq(desc); struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); struct intc_virq_list *entry, *vlist = irq_data_get_irq_handler_data(data);
| |