X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fwatchdog%2Fs3c2410_wdt.c;h=c417fb5e913fadd9a3f141117bb7385340cd3787;hb=8d659f5e43c5db2630e85f507b7384365e9e1c1e;hp=97b4a2e8eb09a62db3e5fa0eae184952be4e76b3;hpb=2e1e9212ed8c532c6b324de77d3cafef5d2bc846;p=linux-2.6

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 97b4a2e8eb..c417fb5e91 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -115,17 +115,6 @@ static void s3c2410wdt_keepalive(void)
 	spin_unlock(&wdt_lock);
 }
 
-static void __s3c2410wdt_stop(void)
-{
-	unsigned long wtcon;
-
-	spin_lock(&wdt_lock);
-	wtcon = readl(wdt_base + S3C2410_WTCON);
-	wtcon &= ~(S3C2410_WTCON_ENABLE | S3C2410_WTCON_RSTEN);
-	writel(wtcon, wdt_base + S3C2410_WTCON);
-	spin_unlock(&wdt_lock);
-}
-
 static void __s3c2410wdt_stop(void)
 {
 	unsigned long wtcon;
@@ -305,8 +294,6 @@ static long s3c2410wdt_ioctl(struct file *file,	unsigned int cmd,
 	int new_margin;
 
 	switch (cmd) {
-	default:
-		return -ENOTTY;
 	case WDIOC_GETSUPPORT:
 		return copy_to_user(argp, &s3c2410_wdt_ident,
 			sizeof(s3c2410_wdt_ident)) ? -EFAULT : 0;
@@ -325,6 +312,8 @@ static long s3c2410wdt_ioctl(struct file *file,	unsigned int cmd,
 		return put_user(tmr_margin, p);
 	case WDIOC_GETTIMEOUT:
 		return put_user(tmr_margin, p);
+	default:
+		return -ENOTTY;
 	}
 }