diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-02 22:53:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-02 22:53:37 +0200 |
| commit | df7cb455850351aa2793ffb41f6a2dcaefd83d9b (patch) | |
| tree | 374f84ee13239586a6754be3cab60e81bfe7ddeb /arch/arm/kernel/irq.c | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
| parent | c4b68520dc0ec96153bc0d87bca5ffba508edfcf (diff) | |
Merge tag 'at91-for-next-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
Nicolas Ferre <nicolas.ferre@atmel.com> writes:
A series about interrupt controller cleanup. AT91 AIC is moving to
fasteoi type of handler and sparse IRQ.
The Device Tree support is added to take into account priority
and external IRQ.
In addition to that, the new AIC5 IP is introduced.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'at91-for-next-cleanup' of git://github.com/at91linux/linux-at91:
ARM: at91: add AIC5 support
ARM: at91: remove mach/irqs.h
ARM: at91: sparse irq support
ARM: at91: at91 based machines specify their own irq handler at run time
ARM: at91: remove static irq priorities for sam9x5
ARM: at91: add of irq priorities support
ARM: at91: aic add dt support for external irqs
ARM: at91: aic can use fast eoi handler type
ARM: at91: fix at91_aic_write macro
ARM: at91: remove two unused headers
Diffstat (limited to 'arch/arm/kernel/irq.c')
| -rw-r--r-- | arch/arm/kernel/irq.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 8349d4e97e2..16cedb42c0c 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -40,13 +40,6 @@ #include <asm/mach/irq.h> #include <asm/mach/time.h> -/* - * No architecture-specific irq_finish function defined in arm/arch/irqs.h. - */ -#ifndef irq_finish -#define irq_finish(irq) do { } while (0) -#endif - unsigned long irq_err_count; int arch_show_interrupts(struct seq_file *p, int prec) @@ -85,9 +78,6 @@ void handle_IRQ(unsigned int irq, struct pt_regs *regs) generic_handle_irq(irq); } - /* AT91 specific workaround */ - irq_finish(irq); - irq_exit(); set_irq_regs(old_regs); } |