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-h720x/cpu-h7202.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-h720x/cpu-h7202.c')
-rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index da678d163fd9..06fecaefd8dc 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c | |||
@@ -106,8 +106,7 @@ static struct platform_device *devices[] __initdata = { | |||
106 | * we have to handle all timer interrupts in one place. | 106 | * we have to handle all timer interrupts in one place. |
107 | */ | 107 | */ |
108 | static void | 108 | static void |
109 | h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc, | 109 | h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc) |
110 | struct pt_regs *regs) | ||
111 | { | 110 | { |
112 | unsigned int mask, irq; | 111 | unsigned int mask, irq; |
113 | 112 | ||
@@ -115,7 +114,7 @@ h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc, | |||
115 | 114 | ||
116 | if ( mask & TSTAT_T0INT ) { | 115 | if ( mask & TSTAT_T0INT ) { |
117 | write_seqlock(&xtime_lock); | 116 | write_seqlock(&xtime_lock); |
118 | timer_tick(regs); | 117 | timer_tick(); |
119 | write_sequnlock(&xtime_lock); | 118 | write_sequnlock(&xtime_lock); |
120 | if( mask == TSTAT_T0INT ) | 119 | if( mask == TSTAT_T0INT ) |
121 | return; | 120 | return; |
@@ -126,7 +125,7 @@ h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc, | |||
126 | desc = irq_desc + irq; | 125 | desc = irq_desc + irq; |
127 | while (mask) { | 126 | while (mask) { |
128 | if (mask & 1) | 127 | if (mask & 1) |
129 | desc_handle_irq(irq, desc, regs); | 128 | desc_handle_irq(irq, desc); |
130 | irq++; | 129 | irq++; |
131 | desc++; | 130 | desc++; |
132 | mask >>= 1; | 131 | mask >>= 1; |
@@ -137,9 +136,9 @@ h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc, | |||
137 | * Timer interrupt handler | 136 | * Timer interrupt handler |
138 | */ | 137 | */ |
139 | static irqreturn_t | 138 | static irqreturn_t |
140 | h7202_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 139 | h7202_timer_interrupt(int irq, void *dev_id) |
141 | { | 140 | { |
142 | h7202_timerx_demux_handler(0, NULL, regs); | 141 | h7202_timerx_demux_handler(0, NULL); |
143 | return IRQ_HANDLED; | 142 | return IRQ_HANDLED; |
144 | } | 143 | } |
145 | 144 | ||