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/irq.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/irq.c')
| -rw-r--r-- | arch/arm/mach-pxa/irq.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index 12141e2a50cc..ab1a16025d51 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c | |||
| @@ -143,8 +143,7 @@ static struct irq_chip pxa_low_gpio_chip = { | |||
| 143 | * Demux handler for GPIO>=2 edge detect interrupts | 143 | * Demux handler for GPIO>=2 edge detect interrupts |
| 144 | */ | 144 | */ |
| 145 | 145 | ||
| 146 | static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | 146 | static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc) |
| 147 | struct pt_regs *regs) | ||
| 148 | { | 147 | { |
| 149 | unsigned int mask; | 148 | unsigned int mask; |
| 150 | int loop; | 149 | int loop; |
| @@ -160,7 +159,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | |||
| 160 | mask >>= 2; | 159 | mask >>= 2; |
| 161 | do { | 160 | do { |
| 162 | if (mask & 1) | 161 | if (mask & 1) |
| 163 | desc_handle_irq(irq, desc, regs); | 162 | desc_handle_irq(irq, desc); |
| 164 | irq++; | 163 | irq++; |
| 165 | desc++; | 164 | desc++; |
| 166 | mask >>= 1; | 165 | mask >>= 1; |
| @@ -175,7 +174,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | |||
| 175 | desc = irq_desc + irq; | 174 | desc = irq_desc + irq; |
| 176 | do { | 175 | do { |
| 177 | if (mask & 1) | 176 | if (mask & 1) |
| 178 | desc_handle_irq(irq, desc, regs); | 177 | desc_handle_irq(irq, desc); |
| 179 | irq++; | 178 | irq++; |
| 180 | desc++; | 179 | desc++; |
| 181 | mask >>= 1; | 180 | mask >>= 1; |
| @@ -190,7 +189,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | |||
| 190 | desc = irq_desc + irq; | 189 | desc = irq_desc + irq; |
| 191 | do { | 190 | do { |
| 192 | if (mask & 1) | 191 | if (mask & 1) |
| 193 | desc_handle_irq(irq, desc, regs); | 192 | desc_handle_irq(irq, desc); |
| 194 | irq++; | 193 | irq++; |
| 195 | desc++; | 194 | desc++; |
| 196 | mask >>= 1; | 195 | mask >>= 1; |
| @@ -206,7 +205,7 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irqdesc *desc, | |||
| 206 | desc = irq_desc + irq; | 205 | desc = irq_desc + irq; |
| 207 | do { | 206 | do { |
| 208 | if (mask & 1) | 207 | if (mask & 1) |
| 209 | desc_handle_irq(irq, desc, regs); | 208 | desc_handle_irq(irq, desc); |
| 210 | irq++; | 209 | irq++; |
| 211 | desc++; | 210 | desc++; |
| 212 | mask >>= 1; | 211 | mask >>= 1; |