aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Cassel <nks@flawful.org>2016-09-22 10:12:48 -0400
committerJesper Nilsson <jespern@axis.com>2016-09-22 10:26:29 -0400
commitd355bcb0d82835db142db3c469541c98d5d9091c (patch)
tree4a985c272424c9f23be4b7449b7cfc71d509195a
parent506823f6e7a349ba3f26f03f162733af64c300cc (diff)
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>
-rw-r--r--arch/cris/arch-v32/kernel/fasttimer.c15
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)
318 318
319static void timer_trig_handler(struct work_struct *work) 319static void timer_trig_handler(struct work_struct *work)
320{ 320{
321 reg_timer_rw_ack_intr ack_intr = { 0 }; 321 reg_timer_rw_ack_intr ack_intr = { 0 };
322 reg_timer_rw_intr_mask intr_mask; 322 reg_timer_rw_intr_mask intr_mask;
323 reg_timer_rw_trig_cfg trig_cfg = { 0 }; 323 reg_timer_rw_trig_cfg trig_cfg = { 0 };
324 struct fast_timer *t; 324 struct fast_timer *t;
325 unsigned long flags; 325 fast_timer_function_type *f;
326 unsigned long d;
327 unsigned long flags;
326 328
327 /* We keep interrupts disabled not only when we modify the 329 /* We keep interrupts disabled not only when we modify the
328 * fast timer list, but any time we hold a reference to a 330 * 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 fast_timer_running = 0; 352 fast_timer_running = 0;
351 fast_timer_ints++; 353 fast_timer_ints++;
352 354
353 fast_timer_function_type *f;
354 unsigned long d;
355
356 t = fast_timer_list; 355 t = fast_timer_list;
357 while (t) { 356 while (t) {
358 struct fasttime_t tv; 357 struct fasttime_t tv;