diff options
Diffstat (limited to 'arch/arm/mach-ixp23xx')
-rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/ixdp2351.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index 566a07821c77..a704a1820048 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
@@ -251,7 +251,7 @@ static void ixp23xx_pci_irq_unmask(unsigned int irq) | |||
251 | /* | 251 | /* |
252 | * TODO: Should this just be done at ASM level? | 252 | * TODO: Should this just be done at ASM level? |
253 | */ | 253 | */ |
254 | static void pci_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 254 | static void pci_handler(unsigned int irq, struct irqdesc *desc) |
255 | { | 255 | { |
256 | u32 pci_interrupt; | 256 | u32 pci_interrupt; |
257 | unsigned int irqno; | 257 | unsigned int irqno; |
@@ -271,7 +271,7 @@ static void pci_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs * | |||
271 | } | 271 | } |
272 | 272 | ||
273 | int_desc = irq_desc + irqno; | 273 | int_desc = irq_desc + irqno; |
274 | desc_handle_irq(irqno, int_desc, regs); | 274 | desc_handle_irq(irqno, int_desc); |
275 | 275 | ||
276 | desc->chip->unmask(irq); | 276 | desc->chip->unmask(irq); |
277 | } | 277 | } |
@@ -348,12 +348,12 @@ ixp23xx_gettimeoffset(void) | |||
348 | } | 348 | } |
349 | 349 | ||
350 | static irqreturn_t | 350 | static irqreturn_t |
351 | ixp23xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 351 | ixp23xx_timer_interrupt(int irq, void *dev_id) |
352 | { | 352 | { |
353 | /* Clear Pending Interrupt by writing '1' to it */ | 353 | /* Clear Pending Interrupt by writing '1' to it */ |
354 | *IXP23XX_TIMER_STATUS = IXP23XX_TIMER1_INT_PEND; | 354 | *IXP23XX_TIMER_STATUS = IXP23XX_TIMER1_INT_PEND; |
355 | while ((signed long)(*IXP23XX_TIMER_CONT - next_jiffy_time) >= LATCH) { | 355 | while ((signed long)(*IXP23XX_TIMER_CONT - next_jiffy_time) >= LATCH) { |
356 | timer_tick(regs); | 356 | timer_tick(); |
357 | next_jiffy_time += LATCH; | 357 | next_jiffy_time += LATCH; |
358 | } | 358 | } |
359 | 359 | ||
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c index 37a32e6bcca2..b6ab0e8bb5e8 100644 --- a/arch/arm/mach-ixp23xx/ixdp2351.c +++ b/arch/arm/mach-ixp23xx/ixdp2351.c | |||
@@ -60,7 +60,7 @@ static void ixdp2351_inta_unmask(unsigned int irq) | |||
60 | *IXDP2351_CPLD_INTA_MASK_CLR_REG = IXDP2351_INTA_IRQ_MASK(irq); | 60 | *IXDP2351_CPLD_INTA_MASK_CLR_REG = IXDP2351_INTA_IRQ_MASK(irq); |
61 | } | 61 | } |
62 | 62 | ||
63 | static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 63 | static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc) |
64 | { | 64 | { |
65 | u16 ex_interrupt = | 65 | u16 ex_interrupt = |
66 | *IXDP2351_CPLD_INTA_STAT_REG & IXDP2351_INTA_IRQ_VALID; | 66 | *IXDP2351_CPLD_INTA_STAT_REG & IXDP2351_INTA_IRQ_VALID; |
@@ -74,7 +74,7 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc, struct | |||
74 | int cpld_irq = | 74 | int cpld_irq = |
75 | IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i); | 75 | IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i); |
76 | cpld_desc = irq_desc + cpld_irq; | 76 | cpld_desc = irq_desc + cpld_irq; |
77 | desc_handle_irq(cpld_irq, cpld_desc, regs); | 77 | desc_handle_irq(cpld_irq, cpld_desc); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
@@ -97,7 +97,7 @@ static void ixdp2351_intb_unmask(unsigned int irq) | |||
97 | *IXDP2351_CPLD_INTB_MASK_CLR_REG = IXDP2351_INTB_IRQ_MASK(irq); | 97 | *IXDP2351_CPLD_INTB_MASK_CLR_REG = IXDP2351_INTB_IRQ_MASK(irq); |
98 | } | 98 | } |
99 | 99 | ||
100 | static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 100 | static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc) |
101 | { | 101 | { |
102 | u16 ex_interrupt = | 102 | u16 ex_interrupt = |
103 | *IXDP2351_CPLD_INTB_STAT_REG & IXDP2351_INTB_IRQ_VALID; | 103 | *IXDP2351_CPLD_INTB_STAT_REG & IXDP2351_INTB_IRQ_VALID; |
@@ -111,7 +111,7 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc, struct | |||
111 | int cpld_irq = | 111 | int cpld_irq = |
112 | IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i); | 112 | IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i); |
113 | cpld_desc = irq_desc + cpld_irq; | 113 | cpld_desc = irq_desc + cpld_irq; |
114 | desc_handle_irq(cpld_irq, cpld_desc, regs); | 114 | desc_handle_irq(cpld_irq, cpld_desc); |
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||