summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-iop32x/irq.c6
-rw-r--r--arch/arm/mach-iop33x/irq.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c
index cdd6943..ff049e0 100644
--- a/arch/arm/mach-iop32x/irq.c
+++ b/arch/arm/mach-iop32x/irq.c
@@ -43,7 +43,7 @@ static void
iop321_irq_mask (unsigned int irq)
{
- iop321_mask &= ~(1 << (irq - IOP321_IRQ_OFS));
+ iop321_mask &= ~(1 << irq);
intctl_write(iop321_mask);
}
@@ -51,7 +51,7 @@ iop321_irq_mask (unsigned int irq)
static void
iop321_irq_unmask (unsigned int irq)
{
- iop321_mask |= (1 << (irq - IOP321_IRQ_OFS));
+ iop321_mask |= (1 << irq);
intctl_write(iop321_mask);
}
@@ -73,7 +73,7 @@ void __init iop321_init_irq(void)
machine_is_iq31244()) // all interrupts are inputs to chip
*IOP3XX_PCIIRSR = 0x0f;
- for(i = IOP321_IRQ_OFS; i < NR_IRQS; i++)
+ for(i = 0; i < NR_IRQS; i++)
{
set_irq_chip(i, &ext_chip);
set_irq_handler(i, do_level_IRQ);
diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c
index d667439..675ed39 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);
OpenPOWER on IntegriCloud