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

Commit 64ffae8a authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Russell King
Browse files

[ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling 



Patch from Thomas Gleixner

From: Thomas Gleixner <tglx@linutronix.de>

Fixup the conversion to generic irq subsystem.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 55e86989

arch/arm/mach-ixp2000/core.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/spinlock.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/serial.h>

#include <linux/tty.h>

#include <linux/bitops.h>
@@ -408,7 +409,7 @@ static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc, str 
	for(i = 31; i >= 0; i--) {

		if(status & (1 << i)) {

			desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i;

			desc->handle(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs);

			desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs);

		}

	}

}

arch/arm/mach-ixp2000/ixdp2x00.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long 
	}



	/* Hook into PCI interrupt */

	set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x00_irq_handler);

	set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x00_irq_handler);

}



/*************************************************************************

arch/arm/mach-ixp2000/ixdp2x01.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void __init ixdp2x01_init_irq(void) 
	}



	/* Hook into PCI interrupts */

	set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x01_irq_handler);

	set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x01_irq_handler);

}