1 files changed, 90 insertions, 100 deletions

diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 386492821fc2..69396adaa5c3 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -37,9 +37,9 @@
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 
-#include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/system.h>
 
 #define WATCHDOG_NAME "w83627hf/thf/hg WDT"
@@ -57,22 +57,26 @@ MODULE_PARM_DESC(wdt_io, "w83627hf/thf WDT io port (default 0x2E)");
 
 static int timeout = WATCHDOG_TIMEOUT;  /* in seconds */
 module_param(timeout, int, 0);
-MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=255, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+MODULE_PARM_DESC(timeout,
+                "Watchdog timeout in seconds. 1 <= timeout <= 255, default="
+                                __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+MODULE_PARM_DESC(nowayout,
+                "Watchdog cannot be stopped once started (default="
+                                __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
 /*
  *      Kernel methods.
  */
 
 #define WDT_EFER (wdt_io+0)   /* Extended Function Enable Registers */
-#define WDT_EFIR (wdt_io+0)   /* Extended Function Index Register (same as EFER) */
+#define WDT_EFIR (wdt_io+0)   /* Extended Function Index Register
+                                                        (same as EFER) */
 #define WDT_EFDR (WDT_EFIR+1) /* Extended Function Data Register */
 
-static void
-w83627hf_select_wd_register(void)
+static void w83627hf_select_wd_register(void)
 {
         unsigned char c;
         outb_p(0x87, WDT_EFER); /* Enter extended function mode */
@@ -93,43 +97,45 @@ w83627hf_select_wd_register(void)
         outb_p(0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
 }
 
-static void
-w83627hf_unselect_wd_register(void)
+static void w83627hf_unselect_wd_register(void)
 {
         outb_p(0xAA, WDT_EFER); /* Leave extended function mode */
 }
 
 /* tyan motherboards seem to set F5 to 0x4C ?
  * So explicitly init to appropriate value. */
-static void
-w83627hf_init(void)
+
+static void w83627hf_init(void)
 {
         unsigned char t;
 
         w83627hf_select_wd_register();
 
         outb_p(0xF6, WDT_EFER); /* Select CRF6 */
-        t=inb_p(WDT_EFDR);      /* read CRF6 */
+        t = inb_p(WDT_EFDR);      /* read CRF6 */
         if (t != 0) {
-                printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
+                printk(KERN_INFO PFX
+                     "Watchdog already running. Resetting timeout to %d sec\n",
+                                                                timeout);
                 outb_p(timeout, WDT_EFDR);    /* Write back to CRF6 */
         }
 
         outb_p(0xF5, WDT_EFER); /* Select CRF5 */
-        t=inb_p(WDT_EFDR);      /* read CRF5 */
-        t&=~0x0C;               /* set second mode & disable keyboard turning off watchdog */
+        t = inb_p(WDT_EFDR);      /* read CRF5 */
+        t &= ~0x0C;               /* set second mode & disable keyboard
+                                    turning off watchdog */
         outb_p(t, WDT_EFDR);    /* Write back to CRF5 */
 
         outb_p(0xF7, WDT_EFER); /* Select CRF7 */
-        t=inb_p(WDT_EFDR);      /* read CRF7 */
-        t&=~0xC0;               /* disable keyboard & mouse turning off watchdog */
+        t = inb_p(WDT_EFDR);      /* read CRF7 */
+        t &= ~0xC0;               /* disable keyboard & mouse turning off
+                                    watchdog */
         outb_p(t, WDT_EFDR);    /* Write back to CRF7 */
 
         w83627hf_unselect_wd_register();
 }
 
-static void
-wdt_ctrl(int timeout)
+static void wdt_ctrl(int timeout)
 {
         spin_lock(&io_lock);
 
@@ -143,32 +149,28 @@ wdt_ctrl(int timeout)
         spin_unlock(&io_lock);
 }
 
-static int
-wdt_ping(void)
+static int wdt_ping(void)
 {
         wdt_ctrl(timeout);
         return 0;
 }
 
-static int
-wdt_disable(void)
+static int wdt_disable(void)
 {
         wdt_ctrl(0);
         return 0;
 }
 
-static int
-wdt_set_heartbeat(int t)
+static int wdt_set_heartbeat(int t)
 {
-        if ((t < 1) || (t > 255))
+        if (t < 1 || t > 255)
                 return -EINVAL;
-
         timeout = t;
         return 0;
 }
 
-static ssize_t
-wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
+static ssize_t wdt_write(struct file *file, const char __user *buf,
+                                                size_t count, loff_t *ppos)
 {
         if (count) {
                 if (!nowayout) {
@@ -178,7 +180,7 @@ wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
 
                         for (i = 0; i != count; i++) {
                                 char c;
-                                if (get_user(c, buf+i))
+                                if (get_user(c, buf + i))
                                         return -EFAULT;
                                 if (c == 'V')
                                         expect_close = 42;
@@ -189,72 +191,61 @@ wdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
         return count;
 }
 
-static int
-wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-          unsigned long arg)
+static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
         int __user *p = argp;
         int new_timeout;
         static struct watchdog_info ident = {
-                .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+                .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |
+                                                        WDIOF_MAGICCLOSE,
                 .firmware_version = 1,
                 .identity = "W83627HF WDT",
         };
 
         switch (cmd) {
         case WDIOC_GETSUPPORT:
-          if (copy_to_user(argp, &ident, sizeof(ident)))
-            return -EFAULT;
-          break;
-
+                if (copy_to_user(argp, &ident, sizeof(ident)))
+                        return -EFAULT;
+                break;
         case WDIOC_GETSTATUS:
         case WDIOC_GETBOOTSTATUS:
-          return put_user(0, p);
-
-        case WDIOC_KEEPALIVE:
-          wdt_ping();
-          break;
-
-        case WDIOC_SETTIMEOUT:
-          if (get_user(new_timeout, p))
-                  return -EFAULT;
-          if (wdt_set_heartbeat(new_timeout))
-                  return -EINVAL;
-          wdt_ping();
-          /* Fall */
-
-        case WDIOC_GETTIMEOUT:
-          return put_user(timeout, p);
-
+                return put_user(0, p);
         case WDIOC_SETOPTIONS:
         {
-          int options, retval = -EINVAL;
-
-          if (get_user(options, p))
-            return -EFAULT;
-
-          if (options & WDIOS_DISABLECARD) {
-            wdt_disable();
-            retval = 0;
-          }
-
-          if (options & WDIOS_ENABLECARD) {
-            wdt_ping();
-            retval = 0;
-          }
+                int options, retval = -EINVAL;
 
-          return retval;
+                if (get_user(options, p))
+                        return -EFAULT;
+                if (options & WDIOS_DISABLECARD) {
+                        wdt_disable();
+                        retval = 0;
+                }
+                if (options & WDIOS_ENABLECARD) {
+                        wdt_ping();
+                        retval = 0;
+                }
+                return retval;
         }
-
+        case WDIOC_KEEPALIVE:
+                wdt_ping();
+                break;
+        case WDIOC_SETTIMEOUT:
+                if (get_user(new_timeout, p))
+                        return -EFAULT;
+                if (wdt_set_heartbeat(new_timeout))
+                        return -EINVAL;
+                wdt_ping();
+                /* Fall */
+        case WDIOC_GETTIMEOUT:
+                return put_user(timeout, p);
         default:
-          return -ENOTTY;
+                return -ENOTTY;
         }
         return 0;
 }
 
-static int
-wdt_open(struct inode *inode, struct file *file)
+static int wdt_open(struct inode *inode, struct file *file)
 {
         if (test_and_set_bit(0, &wdt_is_open))
                 return -EBUSY;
@@ -266,13 +257,13 @@ wdt_open(struct inode *inode, struct file *file)
         return nonseekable_open(inode, file);
 }
 
-static int
-wdt_close(struct inode *inode, struct file *file)
+static int wdt_close(struct inode *inode, struct file *file)
 {
-        if (expect_close == 42) {
+        if (expect_close == 42)
                 wdt_disable();
-        } else {
-                printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
+        else {
+                printk(KERN_CRIT PFX
+                        "Unexpected close, not stopping watchdog!\n");
                 wdt_ping();
         }
         expect_close = 0;
@@ -284,14 +275,12 @@ wdt_close(struct inode *inode, struct file *file)
  *      Notifier for system down
  */
 
-static int
-wdt_notify_sys(struct notifier_block *this, unsigned long code,
+static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
         void *unused)
 {
-        if (code == SYS_DOWN || code == SYS_HALT) {
-                /* Turn the WDT off */
-                wdt_disable();
-        }
+        if (code == SYS_DOWN || code == SYS_HALT)
+                wdt_disable();  /* Turn the WDT off */
+
         return NOTIFY_DONE;
 }
 
@@ -303,7 +292,7 @@ static const struct file_operations wdt_fops = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .write          = wdt_write,
-        .ioctl          = wdt_ioctl,
+        .unlocked_ioctl = wdt_ioctl,
         .open           = wdt_open,
         .release        = wdt_close,
 };
@@ -323,8 +312,7 @@ static struct notifier_block wdt_notifier = {
         .notifier_call = wdt_notify_sys,
 };
 
-static int __init
-wdt_init(void)
+static int __init wdt_init(void)
 {
         int ret;
 
@@ -332,12 +320,13 @@ wdt_init(void)
 
         if (wdt_set_heartbeat(timeout)) {
                 wdt_set_heartbeat(WATCHDOG_TIMEOUT);
-                printk (KERN_INFO PFX "timeout value must be 1<=timeout<=255, using %d\n",
-                        WATCHDOG_TIMEOUT);
+                printk(KERN_INFO PFX
+                     "timeout value must be 1 <= timeout <= 255, using %d\n",
+                                WATCHDOG_TIMEOUT);
         }
 
         if (!request_region(wdt_io, 1, WATCHDOG_NAME)) {
-                printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
+                printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
                         wdt_io);
                 ret = -EIO;
                 goto out;
@@ -347,20 +336,22 @@ wdt_init(void)
 
         ret = register_reboot_notifier(&wdt_notifier);
         if (ret != 0) {
-                printk (KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
-                        ret);
+                printk(KERN_ERR PFX
+                        "cannot register reboot notifier (err=%d)\n", ret);
                 goto unreg_regions;
         }
 
         ret = misc_register(&wdt_miscdev);
         if (ret != 0) {
-                printk (KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
-                        WATCHDOG_MINOR, ret);
+                printk(KERN_ERR PFX
+                        "cannot register miscdev on minor=%d (err=%d)\n",
+                                                        WATCHDOG_MINOR, ret);
                 goto unreg_reboot;
         }
 
-        printk (KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
-                timeout, nowayout);
+        printk(KERN_INFO PFX
+                        "initialized. timeout=%d sec (nowayout=%d)\n",
+                                                        timeout, nowayout);
 
 out:
         return ret;
@@ -371,12 +362,11 @@ unreg_regions:
         goto out;
 }
 
-static void __exit
-wdt_exit(void)
+static void __exit wdt_exit(void)
 {
         misc_deregister(&wdt_miscdev);
         unregister_reboot_notifier(&wdt_notifier);
-        release_region(wdt_io,1);
+        release_region(wdt_io, 1);
 }
 
 module_init(wdt_init);