diff options
| author | Niklas Cassel <nks@flawful.org> | 2016-09-22 16:12:48 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jespern@axis.com> | 2016-09-22 16:26:29 +0200 |
| commit | d355bcb0d82835db142db3c469541c98d5d9091c (patch) | |
| tree | 4a985c272424c9f23be4b7449b7cfc71d509195a /arch/cris | |
| parent | 506823f6e7a349ba3f26f03f162733af64c300cc (diff) | |
| download | linux-stable-d355bcb0d82835db142db3c469541c98d5d9091c.tar.gz linux-stable-d355bcb0d82835db142db3c469541c98d5d9091c.tar.bz2 linux-stable-d355bcb0d82835db142db3c469541c98d5d9091c.zip | |
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: Niklas Cassel <nks@flawful.org>
Signed-off-by: Jesper Nilsson <jespern@axis.com>
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v32/kernel/fasttimer.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c index 5c84dbb99f30..eb4e0ff36295 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c @@ -318,11 +318,13 @@ timer_trig_interrupt(int irq, void *dev_id) static void timer_trig_handler(struct work_struct *work) { - reg_timer_rw_ack_intr ack_intr = { 0 }; - reg_timer_rw_intr_mask intr_mask; - reg_timer_rw_trig_cfg trig_cfg = { 0 }; - struct fast_timer *t; - unsigned long flags; + reg_timer_rw_ack_intr ack_intr = { 0 }; + reg_timer_rw_intr_mask intr_mask; + reg_timer_rw_trig_cfg trig_cfg = { 0 }; + struct fast_timer *t; + fast_timer_function_type *f; + unsigned long d; + unsigned long flags; /* We keep interrupts disabled not only when we modify the * 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) fast_timer_running = 0; fast_timer_ints++; - fast_timer_function_type *f; - unsigned long d; - t = fast_timer_list; while (t) { struct fasttime_t tv; |