forked from luck/tmp_suning_uos_patched
[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: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
55e8698931
commit
64ffae8a32
|
@ -19,6 +19,7 @@
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
|
#include <linux/irq.h>
|
||||||
#include <linux/serial.h>
|
#include <linux/serial.h>
|
||||||
#include <linux/tty.h>
|
#include <linux/tty.h>
|
||||||
#include <linux/bitops.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--) {
|
for(i = 31; i >= 0; i--) {
|
||||||
if(status & (1 << i)) {
|
if(status & (1 << i)) {
|
||||||
desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -167,7 +167,7 @@ void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hook into PCI interrupt */
|
/* Hook into PCI interrupt */
|
||||||
set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x00_irq_handler);
|
set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x00_irq_handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
|
|
|
@ -127,7 +127,7 @@ void __init ixdp2x01_init_irq(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hook into PCI interrupts */
|
/* Hook into PCI interrupts */
|
||||||
set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x01_irq_handler);
|
set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x01_irq_handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user