diff options
| author | David Howells <dhowells@redhat.com> | 2006-09-25 23:32:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 08:48:53 -0700 |
| commit | 88d6e19900366781739df033e9c0e2532e715fa5 (patch) | |
| tree | 97c6d48f0d707002c8239efb6e865a0133d69b68 /arch/frv/kernel/irq.c | |
| parent | 1bcbba306048ed86b935d57a95d887c23d52c94b (diff) | |
[PATCH] FRV: improve FRV's use of generic IRQ handling
Improve FRV's use of generic IRQ handling:
(*) Use generic_handle_irq() rather than __do_IRQ() as the latter is obsolete.
(*) Don't implement enable() and disable() ops as these will fall back to
using unmask() and mask().
(*) Provide mask_ack() functions to avoid a call each to mask() and ack().
(*) Make the cascade handlers always return IRQ_HANDLED.
(*) Implement the mask() and unmask() functions in the same order as they're
listed in the ops table.
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/frv/kernel/irq.c')
| -rw-r--r-- | arch/frv/kernel/irq.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c index e1ab9f2e43fb..5ac041c7c0a4 100644 --- a/arch/frv/kernel/irq.c +++ b/arch/frv/kernel/irq.c @@ -97,19 +97,8 @@ int show_interrupts(struct seq_file *p, void *v) /* * on-CPU PIC operations */ -static void frv_cpupic_enable(unsigned int irqlevel) -{ - __clr_MASK(irqlevel); -} - -static void frv_cpupic_disable(unsigned int irqlevel) -{ - __set_MASK(irqlevel); -} - static void frv_cpupic_ack(unsigned int irqlevel) { - __set_MASK(irqlevel); __clr_RC(irqlevel); __clr_IRL(); } @@ -138,8 +127,6 @@ static void frv_cpupic_end(unsigned int irqlevel) static struct irq_chip frv_cpu_pic = { .name = "cpu", - .enable = frv_cpupic_enable, - .disable = frv_cpupic_disable, .ack = frv_cpupic_ack, .mask = frv_cpupic_mask, .mask_ack = frv_cpupic_mask_ack, @@ -156,7 +143,7 @@ static struct irq_chip frv_cpu_pic = { asmlinkage void do_IRQ(void) { irq_enter(); - __do_IRQ(__get_IRL(), __frame); + generic_handle_irq(__get_IRL(), __frame); irq_exit(); } |