diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 21:10:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 21:10:12 -0400 |
commit | c1ec8295f6e8c888230bbc9b7a416dc26d03688e (patch) | |
tree | 52198f5cedfd1fa6464945ad72d345cf1c2019a2 | |
parent | 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (diff) |
Fix up duplicate '__s3c2410wdt_stop()' function
Looks like somebody didn't get enough sleep.
Noticed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/watchdog/s3c2410_wdt.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 44bf5e4282e1..c417fb5e913f 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
@@ -119,17 +119,6 @@ static void __s3c2410wdt_stop(void) | |||
119 | { | 119 | { |
120 | unsigned long wtcon; | 120 | unsigned long wtcon; |
121 | 121 | ||
122 | spin_lock(&wdt_lock); | ||
123 | wtcon = readl(wdt_base + S3C2410_WTCON); | ||
124 | wtcon &= ~(S3C2410_WTCON_ENABLE | S3C2410_WTCON_RSTEN); | ||
125 | writel(wtcon, wdt_base + S3C2410_WTCON); | ||
126 | spin_unlock(&wdt_lock); | ||
127 | } | ||
128 | |||
129 | static void __s3c2410wdt_stop(void) | ||
130 | { | ||
131 | unsigned long wtcon; | ||
132 | |||
133 | wtcon = readl(wdt_base + S3C2410_WTCON); | 122 | wtcon = readl(wdt_base + S3C2410_WTCON); |
134 | wtcon &= ~(S3C2410_WTCON_ENABLE | S3C2410_WTCON_RSTEN); | 123 | wtcon &= ~(S3C2410_WTCON_ENABLE | S3C2410_WTCON_RSTEN); |
135 | writel(wtcon, wdt_base + S3C2410_WTCON); | 124 | writel(wtcon, wdt_base + S3C2410_WTCON); |