1 files changed, 76 insertions, 86 deletions

diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 8121cc247343..a5110f93a755 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -37,9 +37,9 @@
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 
-#include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/system.h>
 
 #define DRV_NAME "advantechwdt"
@@ -47,7 +47,8 @@
 #define WATCHDOG_NAME "Advantech WDT"
 #define WATCHDOG_TIMEOUT 60             /* 60 sec default timeout */
 
-static struct platform_device *advwdt_platform_device;  /* the watchdog platform device */
+/* the watchdog platform device */
+static struct platform_device *advwdt_platform_device;
 static unsigned long advwdt_is_open;
 static char adv_expect_close;
 
@@ -72,35 +73,35 @@ MODULE_PARM_DESC(wdt_start, "Advantech WDT 'start' io port (default 0x443)");
 
 static int timeout = WATCHDOG_TIMEOUT;  /* in seconds */
 module_param(timeout, int, 0);
-MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
+MODULE_PARM_DESC(timeout,
+        "Watchdog timeout in seconds. 1<= timeout <=63, 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) ")");
 
 /*
  *      Watchdog Operations
  */
 
-static void
-advwdt_ping(void)
+static void advwdt_ping(void)
 {
         /* Write a watchdog value */
         outb_p(timeout, wdt_start);
 }
 
-static void
-advwdt_disable(void)
+static void advwdt_disable(void)
 {
         inb_p(wdt_stop);
 }
 
-static int
-advwdt_set_heartbeat(int t)
+static int advwdt_set_heartbeat(int t)
 {
-        if ((t < 1) || (t > 63))
+        if (t < 1 || t > 63)
                 return -EINVAL;
-
         timeout = t;
         return 0;
 }
@@ -109,8 +110,8 @@ advwdt_set_heartbeat(int t)
  *      /dev/watchdog handling
  */
 
-static ssize_t
-advwdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
+static ssize_t advwdt_write(struct file *file, const char __user *buf,
+                                                size_t count, loff_t *ppos)
 {
         if (count) {
                 if (!nowayout) {
@@ -120,7 +121,7 @@ advwdt_write(struct file *file, const char __user *buf, size_t count, loff_t *pp
 
                         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')
                                         adv_expect_close = 42;
@@ -131,9 +132,7 @@ advwdt_write(struct file *file, const char __user *buf, size_t count, loff_t *pp
         return count;
 }
 
-static int
-advwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-          unsigned long arg)
+static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         int new_timeout;
         void __user *argp = (void __user *)arg;
@@ -146,57 +145,50 @@ advwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
         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:
-          advwdt_ping();
-          break;
-
-        case WDIOC_SETTIMEOUT:
-          if (get_user(new_timeout, p))
-                  return -EFAULT;
-          if (advwdt_set_heartbeat(new_timeout))
-                  return -EINVAL;
-          advwdt_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) {
-            advwdt_disable();
-            retval = 0;
-          }
+                int options, retval = -EINVAL;
 
-          if (options & WDIOS_ENABLECARD) {
-            advwdt_ping();
-            retval = 0;
-          }
-
-          return retval;
+                if (get_user(options, p))
+                        return -EFAULT;
+                if (options & WDIOS_DISABLECARD) {
+                        advwdt_disable();
+                        retval = 0;
+                }
+                if (options & WDIOS_ENABLECARD) {
+                        advwdt_ping();
+                        retval = 0;
+                }
+                return retval;
         }
+        case WDIOC_KEEPALIVE:
+                advwdt_ping();
+                break;
 
+        case WDIOC_SETTIMEOUT:
+                if (get_user(new_timeout, p))
+                        return -EFAULT;
+                if (advwdt_set_heartbeat(new_timeout))
+                        return -EINVAL;
+                advwdt_ping();
+                /* Fall */
+        case WDIOC_GETTIMEOUT:
+                return put_user(timeout, p);
         default:
-          return -ENOTTY;
+                return -ENOTTY;
         }
         return 0;
 }
 
-static int
-advwdt_open(struct inode *inode, struct file *file)
+static int advwdt_open(struct inode *inode, struct file *file)
 {
         if (test_and_set_bit(0, &advwdt_is_open))
                 return -EBUSY;
@@ -208,13 +200,13 @@ advwdt_open(struct inode *inode, struct file *file)
         return nonseekable_open(inode, file);
 }
 
-static int
-advwdt_close(struct inode *inode, struct file *file)
+static int advwdt_close(struct inode *inode, struct file *file)
 {
         if (adv_expect_close == 42) {
                 advwdt_disable();
         } else {
-                printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
+                printk(KERN_CRIT PFX
+                                "Unexpected close, not stopping watchdog!\n");
                 advwdt_ping();
         }
         clear_bit(0, &advwdt_is_open);
@@ -230,7 +222,7 @@ static const struct file_operations advwdt_fops = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .write          = advwdt_write,
-        .ioctl          = advwdt_ioctl,
+        .unlocked_ioctl = advwdt_ioctl,
         .open           = advwdt_open,
         .release        = advwdt_close,
 };
@@ -245,23 +237,24 @@ static struct miscdevice advwdt_miscdev = {
  *      Init & exit routines
  */
 
-static int __devinit
-advwdt_probe(struct platform_device *dev)
+static int __devinit advwdt_probe(struct platform_device *dev)
 {
         int ret;
 
         if (wdt_stop != wdt_start) {
                 if (!request_region(wdt_stop, 1, WATCHDOG_NAME)) {
-                        printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                                wdt_stop);
+                        printk(KERN_ERR PFX
+                                "I/O address 0x%04x already in use\n",
+                                                                wdt_stop);
                         ret = -EIO;
                         goto out;
                 }
         }
 
         if (!request_region(wdt_start, 1, WATCHDOG_NAME)) {
-                printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
-                        wdt_start);
+                printk(KERN_ERR PFX
+                                "I/O address 0x%04x already in use\n",
+                                                                wdt_start);
                 ret = -EIO;
                 goto unreg_stop;
         }
@@ -269,20 +262,19 @@ advwdt_probe(struct platform_device *dev)
         /* Check that the heartbeat value is within it's range ; if not reset to the default */
         if (advwdt_set_heartbeat(timeout)) {
                 advwdt_set_heartbeat(WATCHDOG_TIMEOUT);
-                printk (KERN_INFO PFX "timeout value must be 1<=x<=63, using %d\n",
-                        timeout);
+                printk(KERN_INFO PFX
+                        "timeout value must be 1<=x<=63, using %d\n", timeout);
         }
 
         ret = misc_register(&advwdt_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_regions;
         }
-
-        printk (KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
+        printk(KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
                 timeout, nowayout);
-
 out:
         return ret;
 unreg_regions:
@@ -293,19 +285,17 @@ unreg_stop:
         goto out;
 }
 
-static int __devexit
-advwdt_remove(struct platform_device *dev)
+static int __devexit advwdt_remove(struct platform_device *dev)
 {
         misc_deregister(&advwdt_miscdev);
-        release_region(wdt_start,1);
-        if(wdt_stop != wdt_start)
-                release_region(wdt_stop,1);
+        release_region(wdt_start, 1);
+        if (wdt_stop != wdt_start)
+                release_region(wdt_stop, 1);
 
         return 0;
 }
 
-static void
-advwdt_shutdown(struct platform_device *dev)
+static void advwdt_shutdown(struct platform_device *dev)
 {
         /* Turn the WDT off if we have a soft shutdown */
         advwdt_disable();
@@ -321,18 +311,19 @@ static struct platform_driver advwdt_driver = {
         },
 };
 
-static int __init
-advwdt_init(void)
+static int __init advwdt_init(void)
 {
         int err;
 
-        printk(KERN_INFO "WDT driver for Advantech single board computer initialising.\n");
+        printk(KERN_INFO
+             "WDT driver for Advantech single board computer initialising.\n");
 
         err = platform_driver_register(&advwdt_driver);
         if (err)
                 return err;
 
-        advwdt_platform_device = platform_device_register_simple(DRV_NAME, -1, NULL, 0);
+        advwdt_platform_device = platform_device_register_simple(DRV_NAME,
+                                                                -1, NULL, 0);
         if (IS_ERR(advwdt_platform_device)) {
                 err = PTR_ERR(advwdt_platform_device);
                 goto unreg_platform_driver;
@@ -345,8 +336,7 @@ unreg_platform_driver:
         return err;
 }
 
-static void __exit
-advwdt_exit(void)
+static void __exit advwdt_exit(void)
 {
         platform_device_unregister(advwdt_platform_device);
         platform_driver_unregister(&advwdt_driver);