summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop33x
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2006-09-18 23:22:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-25 10:25:46 +0100
commit610300e8f4f833904096ca1233ffd9dbd73fb11f (patch)
tree2b8e26c511edbbfc666af184a3de984c03d06220 /arch/arm/mach-iop33x
parent38ce73ebd74a9a1738b73619557f2397c59ba628 (diff)
[ARM] 3826/1: iop3xx: remove IOP3??_IRQ_OFS irq offset
Get rid of the unused IOP3??_IRQ_OFS irq offset define, start IRQ numbering from zero. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop33x')
-rw-r--r--arch/arm/mach-iop33x/irq.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c
index d667439c857..675ed398997 100644
--- a/arch/arm/mach-iop33x/irq.c
+++ b/arch/arm/mach-iop33x/irq.c
@@ -60,28 +60,28 @@ static inline void intstr_write1(u32 val)
static void
iop331_irq_mask1 (unsigned int irq)
{
- iop331_mask0 &= ~(1 << (irq - IOP331_IRQ_OFS));
+ iop331_mask0 &= ~(1 << irq);
intctl_write0(iop331_mask0);
}
static void
iop331_irq_mask2 (unsigned int irq)
{
- iop331_mask1 &= ~(1 << (irq - IOP331_IRQ_OFS - 32));
+ iop331_mask1 &= ~(1 << (irq - 32));
intctl_write1(iop331_mask1);
}
static void
iop331_irq_unmask1(unsigned int irq)
{
- iop331_mask0 |= (1 << (irq - IOP331_IRQ_OFS));
+ iop331_mask0 |= (1 << irq);
intctl_write0(iop331_mask0);
}
static void
iop331_irq_unmask2(unsigned int irq)
{
- iop331_mask1 |= (1 << (irq - IOP331_IRQ_OFS - 32));
+ iop331_mask1 |= (1 << (irq - 32));
intctl_write1(iop331_mask1);
}
@@ -110,7 +110,7 @@ void __init iop331_init_irq(void)
if(machine_is_iq80331()) // all interrupts are inputs to chip
*IOP3XX_PCIIRSR = 0x0f;
- for(i = IOP331_IRQ_OFS; i < NR_IRQS; i++)
+ for(i = 0; i < NR_IRQS; i++)
{
set_irq_chip(i, (i < 32) ? &iop331_irqchip1 : &iop331_irqchip2);
set_irq_handler(i, do_level_IRQ);