Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/m68k/coldfire/intc-5272.c

+3 −1
Original line number Diff line number Diff line
@@ -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

 * 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);

	handle_simple_irq(irq, desc);

}

arch/m68k/mac/oss.c

+4 −2
Original line number Diff line number Diff line
@@ -63,13 +63,15 @@ void __init oss_nubus_init(void) 
 * 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 &

		(OSS_IP_IOPSCC | OSS_IP_SCSI | OSS_IP_IOPISM);



#ifdef DEBUG_IRQS

	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,

			(int) oss->irq_pending);

	}

arch/m68k/mac/psc.c

+2 −1
Original line number Diff line number Diff line
@@ -113,9 +113,10 @@ void __init psc_init(void) 
 * 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 irq = irq_desc_get_irq(desc);

	int pIFR	= pIFRbase + offset;

	int pIER	= pIERbase + offset;

	int irq_num;