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-pxa/lpd270.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/mach-pxa/lpd270.c')
-rw-r--r-- | arch/arm/mach-pxa/lpd270.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index eff2a91b2565..5749f6b72e12 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c | |||
@@ -75,8 +75,7 @@ static struct irq_chip lpd270_irq_chip = { | |||
75 | .unmask = lpd270_unmask_irq, | 75 | .unmask = lpd270_unmask_irq, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static void lpd270_irq_handler(unsigned int irq, struct irqdesc *desc, | 78 | static void lpd270_irq_handler(unsigned int irq, struct irqdesc *desc) |
79 | struct pt_regs *regs) | ||
80 | { | 79 | { |
81 | unsigned long pending; | 80 | unsigned long pending; |
82 | 81 | ||
@@ -86,7 +85,7 @@ static void lpd270_irq_handler(unsigned int irq, struct irqdesc *desc, | |||
86 | if (likely(pending)) { | 85 | if (likely(pending)) { |
87 | irq = LPD270_IRQ(0) + __ffs(pending); | 86 | irq = LPD270_IRQ(0) + __ffs(pending); |
88 | desc = irq_desc + irq; | 87 | desc = irq_desc + irq; |
89 | desc_handle_irq(irq, desc, regs); | 88 | desc_handle_irq(irq, desc); |
90 | 89 | ||
91 | pending = __raw_readw(LPD270_INT_STATUS) & | 90 | pending = __raw_readw(LPD270_INT_STATUS) & |
92 | lpd270_irq_enabled; | 91 | lpd270_irq_enabled; |