Commit f9f91ef5 authored by Thomas Gleixner's avatar Thomas Gleixner

h8300: Convert interrupt handling to flow handler

__do_IRQ is deprecated so h8300 needs to be converted to proper flow
handling. The irq chip is simple and does not required any
mask/ack/eoi functions, so we can use handle_simple_irq.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Paul Mundt <lethal@linux-sh.org>
parent 12174aac
...@@ -50,10 +50,6 @@ static void h8300_disable_irq(struct irq_data *data) ...@@ -50,10 +50,6 @@ static void h8300_disable_irq(struct irq_data *data)
IER_REGS &= ~(1 << (data->irq - EXT_IRQ0)); IER_REGS &= ~(1 << (data->irq - EXT_IRQ0));
} }
static void h8300_end_irq(unsigned int irq)
{
}
static unsigned int h8300_startup_irq(struct irq_data *data) static unsigned int h8300_startup_irq(struct irq_data *data)
{ {
if (is_ext_irq(data->irq)) if (is_ext_irq(data->irq))
...@@ -77,7 +73,6 @@ struct irq_chip h8300irq_chip = { ...@@ -77,7 +73,6 @@ struct irq_chip h8300irq_chip = {
.irq_shutdown = h8300_shutdown_irq, .irq_shutdown = h8300_shutdown_irq,
.irq_enable = h8300_enable_irq, .irq_enable = h8300_enable_irq,
.irq_disable = h8300_disable_irq, .irq_disable = h8300_disable_irq,
.end = h8300_end_irq,
}; };
#if defined(CONFIG_RAMKERNEL) #if defined(CONFIG_RAMKERNEL)
...@@ -159,18 +154,14 @@ void __init init_IRQ(void) ...@@ -159,18 +154,14 @@ void __init init_IRQ(void)
setup_vector(); setup_vector();
for (c = 0; c < NR_IRQS; c++) { for (c = 0; c < NR_IRQS; c++)
irq_desc[c].status = IRQ_DISABLED; set_irq_chip_and_handler(c, &h8300irq_chip, handle_simple_irq);
irq_desc[c].action = NULL;
irq_desc[c].depth = 1;
irq_desc[c].chip = &h8300irq_chip;
}
} }
asmlinkage void do_IRQ(int irq) asmlinkage void do_IRQ(int irq)
{ {
irq_enter(); irq_enter();
__do_IRQ(irq); generic_handle_irq(irq);
irq_exit(); irq_exit();
} }
......
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