Commit 625b86ad authored by Thomas Gleixner's avatar Thomas Gleixner

m68k/irq: Prepare irq 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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
parent 88bd6462
...@@ -143,8 +143,10 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type) ...@@ -143,8 +143,10 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type)
* We need to be careful with the masking/acking due to the side effects * We need to be careful with the masking/acking due to the side effects
* of masking an interrupt. * of masking an interrupt.
*/ */
static void intc_external_irq(unsigned int irq, struct irq_desc *desc) static void intc_external_irq(unsigned int __irq, struct irq_desc *desc)
{ {
unsigned int irq = irq_desc_get_irq(desc);
irq_desc_get_chip(desc)->irq_ack(&desc->irq_data); irq_desc_get_chip(desc)->irq_ack(&desc->irq_data);
handle_simple_irq(irq, desc); handle_simple_irq(irq, desc);
} }
......
...@@ -63,13 +63,15 @@ void __init oss_nubus_init(void) ...@@ -63,13 +63,15 @@ void __init oss_nubus_init(void)
* Handle miscellaneous OSS interrupts. * Handle miscellaneous OSS interrupts.
*/ */
static void oss_irq(unsigned int irq, struct irq_desc *desc) static void oss_irq(unsigned int __irq, struct irq_desc *desc)
{ {
int events = oss->irq_pending & int events = oss->irq_pending &
(OSS_IP_IOPSCC | OSS_IP_SCSI | OSS_IP_IOPISM); (OSS_IP_IOPSCC | OSS_IP_SCSI | OSS_IP_IOPISM);
#ifdef DEBUG_IRQS #ifdef DEBUG_IRQS
if ((console_loglevel == 10) && !(events & OSS_IP_SCSI)) { if ((console_loglevel == 10) && !(events & OSS_IP_SCSI)) {
unsigned int irq = irq_desc_get_irq(desc);
printk("oss_irq: irq %u events = 0x%04X\n", irq, printk("oss_irq: irq %u events = 0x%04X\n", irq,
(int) oss->irq_pending); (int) oss->irq_pending);
} }
......
...@@ -113,9 +113,10 @@ void __init psc_init(void) ...@@ -113,9 +113,10 @@ void __init psc_init(void)
* PSC interrupt handler. It's a lot like the VIA interrupt handler. * PSC interrupt handler. It's a lot like the VIA interrupt handler.
*/ */
static void psc_irq(unsigned int irq, struct irq_desc *desc) static void psc_irq(unsigned int __irq, struct irq_desc *desc)
{ {
unsigned int offset = (unsigned int)irq_desc_get_handler_data(desc); unsigned int offset = (unsigned int)irq_desc_get_handler_data(desc);
unsigned int irq = irq_desc_get_irq(desc);
int pIFR = pIFRbase + offset; int pIFR = pIFRbase + offset;
int pIER = pIERbase + offset; int pIER = pIERbase + offset;
int irq_num; int irq_num;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment