h8300: get rid of __do_IRQ use
PATCH 1/1 h8300: get rid of __do_IRQ use
Replace __do_IRQ use with handle_edge_irq handler, and remove some redundant initialization.
Signed-off-by Kyle McMartin <[email protected]>
---
This commit is neither boot tested, nor build tested, since the latest kernel seems to be broken on the h8300 cross-compiler I was using...
arch/h8300/Kconfig | 4 ++++ arch/h8300/kernel/irq.c | 16 ++++------------ 2 files changed, 8 insertions(+), 12 deletions(-)
arch/h8300/Kconfig +4 -0
@@ -58,6 +58,10 @@ config GENERIC_HARDIRQS bool default y +config GENERIC_HARDIRQS_NO__DO_IRQ + bool + default y + config GENERIC_CALIBRATE_DELAY bool default y
arch/h8300/kernel/irq.c +4 -12
@@ -50,10 +50,6 @@ static void h8300_disable_irq(unsigned int irq)IER_REGS &= ~(1 << (irq -EXT_IRQ0 )); } -static void h8300_end_irq (unsigned int irq) -{ -} -static unsigned int h8300_startup_irq (unsigned int irq) {if (is_ext_irq (irq))
@@ -75,10 +71,9 @@ struct irq_chip h8300irq_chip = { .name = "H8300-INTC", .startup = h8300_startup_irq, .shutdown = h8300_shutdown_irq, - .enable = h8300_enable_irq, + .unmask = h8300_enable_irq, + .mask = h8300_disable_irq, .disable = h8300_disable_irq, - .ack = NULL, - .end = h8300_end_irq, };#if defined(CONFIG_RAMKERNEL )
@@ -161,17 +156,14 @@ void __init init_IRQ(void)setup_vector ();for (c =0 ; c <NR_IRQS ; c++) { - irq_desc[c].status =IRQ_DISABLED ; - irq_desc[c].action =NULL ; - irq_desc[c].depth =1 ; - irq_desc[c].chip = &h8300irq_chip; +set_irq_chip_and_handler (c, &h8300_irq_chip, handle_edge_irq); } } asmlinkage void do_IRQ(int irq) {irq_enter (); -__do_IRQ (irq); +generic_handle_irq (irq);irq_exit (); }