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/common/sharpsl_pm.c | |
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/common/sharpsl_pm.c')
-rw-r--r-- | arch/arm/common/sharpsl_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index f412dedda684..605dedf96790 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -258,7 +258,7 @@ static void sharpsl_ac_timer(unsigned long data) | |||
258 | } | 258 | } |
259 | 259 | ||
260 | 260 | ||
261 | irqreturn_t sharpsl_ac_isr(int irq, void *dev_id, struct pt_regs *fp) | 261 | irqreturn_t sharpsl_ac_isr(int irq, void *dev_id) |
262 | { | 262 | { |
263 | /* Delay the event slightly to debounce */ | 263 | /* Delay the event slightly to debounce */ |
264 | /* Must be a smaller delay than the chrg_full_isr below */ | 264 | /* Must be a smaller delay than the chrg_full_isr below */ |
@@ -293,7 +293,7 @@ static void sharpsl_chrg_full_timer(unsigned long data) | |||
293 | /* Charging Finished Interrupt (Not present on Corgi) */ | 293 | /* Charging Finished Interrupt (Not present on Corgi) */ |
294 | /* Can trigger at the same time as an AC staus change so | 294 | /* Can trigger at the same time as an AC staus change so |
295 | delay until after that has been processed */ | 295 | delay until after that has been processed */ |
296 | irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id, struct pt_regs *fp) | 296 | irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id) |
297 | { | 297 | { |
298 | if (sharpsl_pm.flags & SHARPSL_SUSPENDED) | 298 | if (sharpsl_pm.flags & SHARPSL_SUSPENDED) |
299 | return IRQ_HANDLED; | 299 | return IRQ_HANDLED; |
@@ -304,7 +304,7 @@ irqreturn_t sharpsl_chrg_full_isr(int irq, void *dev_id, struct pt_regs *fp) | |||
304 | return IRQ_HANDLED; | 304 | return IRQ_HANDLED; |
305 | } | 305 | } |
306 | 306 | ||
307 | irqreturn_t sharpsl_fatal_isr(int irq, void *dev_id, struct pt_regs *fp) | 307 | irqreturn_t sharpsl_fatal_isr(int irq, void *dev_id) |
308 | { | 308 | { |
309 | int is_fatal = 0; | 309 | int is_fatal = 0; |
310 | 310 | ||