Commit d355bcb0 authored by Niklas Cassel's avatar Niklas Cassel Committed by Jesper Nilsson

cris: fasttimer: fix mixed declarations and code compile warning

arch/cris/arch-v32/kernel/fasttimer.c: In function ‘timer_trig_handler’:
arch/cris/arch-v32/kernel/fasttimer.c:353:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
  fast_timer_function_type *f;
  ^
Signed-off-by: default avatarNiklas Cassel <nks@flawful.org>
Signed-off-by: default avatarJesper Nilsson <jespern@axis.com>
parent 506823f6
...@@ -318,11 +318,13 @@ timer_trig_interrupt(int irq, void *dev_id) ...@@ -318,11 +318,13 @@ timer_trig_interrupt(int irq, void *dev_id)
static void timer_trig_handler(struct work_struct *work) static void timer_trig_handler(struct work_struct *work)
{ {
reg_timer_rw_ack_intr ack_intr = { 0 }; reg_timer_rw_ack_intr ack_intr = { 0 };
reg_timer_rw_intr_mask intr_mask; reg_timer_rw_intr_mask intr_mask;
reg_timer_rw_trig_cfg trig_cfg = { 0 }; reg_timer_rw_trig_cfg trig_cfg = { 0 };
struct fast_timer *t; struct fast_timer *t;
unsigned long flags; fast_timer_function_type *f;
unsigned long d;
unsigned long flags;
/* We keep interrupts disabled not only when we modify the /* We keep interrupts disabled not only when we modify the
* fast timer list, but any time we hold a reference to a * fast timer list, but any time we hold a reference to a
...@@ -350,9 +352,6 @@ static void timer_trig_handler(struct work_struct *work) ...@@ -350,9 +352,6 @@ static void timer_trig_handler(struct work_struct *work)
fast_timer_running = 0; fast_timer_running = 0;
fast_timer_ints++; fast_timer_ints++;
fast_timer_function_type *f;
unsigned long d;
t = fast_timer_list; t = fast_timer_list;
while (t) { while (t) {
struct fasttime_t tv; struct fasttime_t tv;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment