From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Thu, 24 Jan 2008 13:34:37 +0000 (+0100)
Subject: CRIS v32: Change debug and formatting in kernel/fasttimer.c
X-Git-Tag: v2.6.25-rc1~40^2~61
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f64dd2191d9b64358c0f357b0f28e149ce7f3d83;p=linux-2.6

CRIS v32: Change debug and formatting in kernel/fasttimer.c

- Don't use SANITYCHECK(x) as a macro, test FAST_TIMER_SANITY_CHECKS with
  ifdef. This makes it possible for automatic indent etc to work.
- Correct some whitespace errors.
- Don't initialize static variable.
---

diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c
index 30514625ee..2de9d5849e 100644
--- a/arch/cris/arch-v32/kernel/fasttimer.c
+++ b/arch/cris/arch-v32/kernel/fasttimer.c
@@ -44,10 +44,7 @@
 #define FAST_TIMER_SANITY_CHECKS
 
 #ifdef FAST_TIMER_SANITY_CHECKS
-#define SANITYCHECK(x) x
-static int sanity_failed = 0;
-#else
-#define SANITYCHECK(x)
+static int sanity_failed;
 #endif
 
 #define D1(x)
@@ -206,7 +203,8 @@ void start_one_shot_timer(struct fast_timer *t,
   do_gettimeofday_fast(&t->tv_set);
   tmp = fast_timer_list;
 
-  SANITYCHECK({ /* Check so this is not in the list already... */
+#ifdef FAST_TIMER_SANITY_CHECKS
+	/* Check so this is not in the list already... */
 	while (tmp != NULL) {
 		if (tmp == t) {
 			printk(KERN_DEBUG
@@ -215,10 +213,10 @@ void start_one_shot_timer(struct fast_timer *t,
 			sanity_failed++;
 			goto done;
 		} else
-        tmp = tmp->next;
-    }
-    tmp = fast_timer_list;
-  });
+			tmp = tmp->next;
+	}
+	tmp = fast_timer_list;
+#endif
 
   t->delay_us = delay_us;
   t->function = function;