diff options
| author | Alexander Shiyan | 2012-05-15 19:55:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2012-05-15 21:20:59 +0200 |
| commit | 0573a2bb885848af67127b77dbebb900d0ae19b9 (patch) | |
| tree | 16fcf43f9add78c9be10c159970e275965778768 /arch/arm/mach-clps711x/common.c | |
| parent | ARM clps711x: Removed unused header mach/time.h (diff) | |
| download | kernel-qcow2-linux-0573a2bb885848af67127b77dbebb900d0ae19b9.tar.gz kernel-qcow2-linux-0573a2bb885848af67127b77dbebb900d0ae19b9.tar.xz kernel-qcow2-linux-0573a2bb885848af67127b77dbebb900d0ae19b9.zip | |
ARM: clps711x: Cleanup IRQ handling
This patch contains two changes:
- Removed unused definitions from mach/irqs.h
- Do not mask interrupts in ack procedure, because we have separate
intX_mask procedure for do it and actually these 2 functions are
called sequentially
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-clps711x/common.c')
| -rw-r--r-- | arch/arm/mach-clps711x/common.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c index b6dfd2f22cd4..c965fd8eb31a 100644 --- a/arch/arm/mach-clps711x/common.c +++ b/arch/arm/mach-clps711x/common.c @@ -66,12 +66,6 @@ static void int1_mask(struct irq_data *d) static void int1_ack(struct irq_data *d) { - u32 intmr1; - - intmr1 = clps_readl(INTMR1); - intmr1 &= ~(1 << d->irq); - clps_writel(intmr1, INTMR1); - switch (d->irq) { case IRQ_CSINT: clps_writel(0, COEOI); break; case IRQ_TC1OI: clps_writel(0, TC1EOI); break; @@ -108,12 +102,6 @@ static void int2_mask(struct irq_data *d) static void int2_ack(struct irq_data *d) { - u32 intmr2; - - intmr2 = clps_readl(INTMR2); - intmr2 &= ~(1 << (d->irq - 16)); - clps_writel(intmr2, INTMR2); - switch (d->irq) { case IRQ_KBDINT: clps_writel(0, KBDEOI); break; } |