Skip to content

Commit

Permalink
ARM: clps711x: Cleanup IRQ handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Shiyan authored and Arnd Bergmann committed May 15, 2012
1 parent 9b747fe commit 0573a2b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
12 changes: 0 additions & 12 deletions arch/arm/mach-clps711x/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
5 changes: 1 addition & 4 deletions arch/arm/mach-clps711x/include/mach/irqs.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#define IRQ_SSEOTI 15

#define INT1_IRQS (0x0000fff0)
#define INT1_ACK_IRQS (0x00004f10)

/*
* Interrupts from INTSR2
Expand All @@ -47,7 +46,5 @@
#define IRQ_URXINT2 (16+13) /* bit 13 */

#define INT2_IRQS (0x30070000)
#define INT2_ACK_IRQS (0x00010000)

#define NR_IRQS 30

#define NR_IRQS 30

0 comments on commit 0573a2b

Please sign in to comment.