diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:59:54 -0400 |
commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-ep93xx | |
parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index a87a784b9201..e3fd1ab6adcc 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
@@ -97,7 +97,7 @@ static unsigned int last_jiffy_time; | |||
97 | 97 | ||
98 | #define TIMER4_TICKS_PER_JIFFY ((CLOCK_TICK_RATE + (HZ/2)) / HZ) | 98 | #define TIMER4_TICKS_PER_JIFFY ((CLOCK_TICK_RATE + (HZ/2)) / HZ) |
99 | 99 | ||
100 | static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 100 | static int ep93xx_timer_interrupt(int irq, void *dev_id) |
101 | { | 101 | { |
102 | write_seqlock(&xtime_lock); | 102 | write_seqlock(&xtime_lock); |
103 | 103 | ||
@@ -106,7 +106,7 @@ static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
106 | (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time) | 106 | (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time) |
107 | >= TIMER4_TICKS_PER_JIFFY) { | 107 | >= TIMER4_TICKS_PER_JIFFY) { |
108 | last_jiffy_time += TIMER4_TICKS_PER_JIFFY; | 108 | last_jiffy_time += TIMER4_TICKS_PER_JIFFY; |
109 | timer_tick(regs); | 109 | timer_tick(); |
110 | } | 110 | } |
111 | 111 | ||
112 | write_sequnlock(&xtime_lock); | 112 | write_sequnlock(&xtime_lock); |
@@ -245,7 +245,7 @@ EXPORT_SYMBOL(gpio_line_set); | |||
245 | * EP93xx IRQ handling | 245 | * EP93xx IRQ handling |
246 | *************************************************************************/ | 246 | *************************************************************************/ |
247 | static void ep93xx_gpio_ab_irq_handler(unsigned int irq, | 247 | static void ep93xx_gpio_ab_irq_handler(unsigned int irq, |
248 | struct irqdesc *desc, struct pt_regs *regs) | 248 | struct irqdesc *desc) |
249 | { | 249 | { |
250 | unsigned char status; | 250 | unsigned char status; |
251 | int i; | 251 | int i; |
@@ -254,7 +254,7 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, | |||
254 | for (i = 0; i < 8; i++) { | 254 | for (i = 0; i < 8; i++) { |
255 | if (status & (1 << i)) { | 255 | if (status & (1 << i)) { |
256 | desc = irq_desc + IRQ_EP93XX_GPIO(0) + i; | 256 | desc = irq_desc + IRQ_EP93XX_GPIO(0) + i; |
257 | desc_handle_irq(IRQ_EP93XX_GPIO(0) + i, desc, regs); | 257 | desc_handle_irq(IRQ_EP93XX_GPIO(0) + i, desc); |
258 | } | 258 | } |
259 | } | 259 | } |
260 | 260 | ||
@@ -262,7 +262,7 @@ static void ep93xx_gpio_ab_irq_handler(unsigned int irq, | |||
262 | for (i = 0; i < 8; i++) { | 262 | for (i = 0; i < 8; i++) { |
263 | if (status & (1 << i)) { | 263 | if (status & (1 << i)) { |
264 | desc = irq_desc + IRQ_EP93XX_GPIO(8) + i; | 264 | desc = irq_desc + IRQ_EP93XX_GPIO(8) + i; |
265 | desc_handle_irq(IRQ_EP93XX_GPIO(8) + i, desc, regs); | 265 | desc_handle_irq(IRQ_EP93XX_GPIO(8) + i, desc); |
266 | } | 266 | } |
267 | } | 267 | } |
268 | } | 268 | } |