From: Li Zefan <lizf@cn.fujitsu.com>
Date: Fri, 8 Feb 2008 12:19:23 +0000 (-0800)
Subject: clocksource: remove redundant code
X-Git-Tag: v2.6.25-rc1~201
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=818c357802e2791880057fe752dc9ce9e210f772;p=linux-2.6

clocksource: remove redundant code

Flag CLOCK_SOURCE_WATCHDOG is cleared twice.  Note clocksource_change_rating()
won't do anyting with the cs flag.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 81afb3927e..548c436a77 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -91,7 +91,6 @@ static void clocksource_ratewd(struct clocksource *cs, int64_t delta)
 	       cs->name, delta);
 	cs->flags &= ~(CLOCK_SOURCE_VALID_FOR_HRES | CLOCK_SOURCE_WATCHDOG);
 	clocksource_change_rating(cs, 0);
-	cs->flags &= ~CLOCK_SOURCE_WATCHDOG;
 	list_del(&cs->wd_list);
 }