summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-01-24 14:34:37 +0100
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 11:06:34 +0100
commitf64dd2191d9b64358c0f357b0f28e149ce7f3d83 (patch)
tree0f182834d7dfba38085f994d4ce919795cf0a542
parent43e6bd6aa8fa8ba5e72e1bcd9062cc3627f4a6c1 (diff)
downloadop-kernel-dev-f64dd2191d9b64358c0f357b0f28e149ce7f3d83.zip
op-kernel-dev-f64dd2191d9b64358c0f357b0f28e149ce7f3d83.tar.gz
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.
-rw-r--r--arch/cris/arch-v32/kernel/fasttimer.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c
index 3051462..2de9d58 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;
OpenPOWER on IntegriCloud