wdt: Cleanup and sort out locking and inb_p

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 94 insertions, 82 deletions

diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index 756fb15fdce7..53a6b18bcb9a 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -24,9 +24,10 @@
  *                                      Matt Crocker).
  *              Alan Cox        :       Added wdt= boot option
  *              Alan Cox        :       Cleaned up copy/user stuff
- *              Tim Hockin      :       Added insmod parameters, comment cleanup
- *                                      Parameterized timeout
- *              Tigran Aivazian :       Restructured wdt_init() to handle failures
+ *              Tim Hockin      :       Added insmod parameters, comment
+ *                                      cleanup, parameterized timeout
+ *              Tigran Aivazian :       Restructured wdt_init() to handle
+ *                                      failures
  *              Joel Becker     :       Added WDIOC_GET/SETTIMEOUT
  *              Matt Domsch     :       Added nowayout module option
  */
@@ -42,9 +43,9 @@
 #include <linux/notifier.h>
 #include <linux/reboot.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>
 #include "wd501p.h"
 
@@ -60,15 +61,19 @@ static char expect_close;
 static int heartbeat = WD_TIMO;
 static int wd_heartbeat;
 module_param(heartbeat, int, 0);
-MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (0<heartbeat<65536, default=" __MODULE_STRING(WD_TIMO) ")");
+MODULE_PARM_DESC(heartbeat,
+        "Watchdog heartbeat in seconds. (0 < heartbeat < 65536, default="
+                                __MODULE_STRING(WD_TIMO) ")");
 
 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) ")");
 
 /* You must set these - there is no sane way to probe for this board. */
-static int io=0x240;
-static int irq=11;
+static int io = 0x240;
+static int irq = 11;
 
 static DEFINE_SPINLOCK(wdt_lock);
 
@@ -82,7 +87,8 @@ MODULE_PARM_DESC(irq, "WDT irq (default=11)");
 static int tachometer;
 
 module_param(tachometer, int, 0);
-MODULE_PARM_DESC(tachometer, "WDT501-P Fan Tachometer support (0=disable, default=0)");
+MODULE_PARM_DESC(tachometer,
+                "WDT501-P Fan Tachometer support (0=disable, default=0)");
 #endif /* CONFIG_WDT_501 */
 
 /*
@@ -91,9 +97,9 @@ MODULE_PARM_DESC(tachometer, "WDT501-P Fan Tachometer support (0=disable, defaul
 
 static void wdt_ctr_mode(int ctr, int mode)
 {
-        ctr<<=6;
-        ctr|=0x30;
-        ctr|=(mode<<1);
+        ctr <<= 6;
+        ctr |= 0x30;
+        ctr |= (mode << 1);
         outb_p(ctr, WDT_CR);
 }
 
@@ -114,12 +120,15 @@ static int wdt_start(void)
         unsigned long flags;
         spin_lock_irqsave(&wdt_lock, flags);
         inb_p(WDT_DC);                  /* Disable watchdog */
-        wdt_ctr_mode(0,3);              /* Program CTR0 for Mode 3: Square Wave Generator */
-        wdt_ctr_mode(1,2);              /* Program CTR1 for Mode 2: Rate Generator */
-        wdt_ctr_mode(2,0);              /* Program CTR2 for Mode 0: Pulse on Terminal Count */
+        wdt_ctr_mode(0, 3);             /* Program CTR0 for Mode 3:
+                                                Square Wave Generator */
+        wdt_ctr_mode(1, 2);             /* Program CTR1 for Mode 2:
+                                                Rate Generator */
+        wdt_ctr_mode(2, 0);             /* Program CTR2 for Mode 0:
+                                                Pulse on Terminal Count */
         wdt_ctr_load(0, 8948);          /* Count at 100Hz */
-        wdt_ctr_load(1,wd_heartbeat);   /* Heartbeat */
-        wdt_ctr_load(2,65535);          /* Length of reset pulse */
+        wdt_ctr_load(1, wd_heartbeat);  /* Heartbeat */
+        wdt_ctr_load(2, 65535);         /* Length of reset pulse */
         outb_p(0, WDT_DC);              /* Enable watchdog */
         spin_unlock_irqrestore(&wdt_lock, flags);
         return 0;
@@ -131,13 +140,13 @@ static int wdt_start(void)
  *      Stop the watchdog driver.
  */
 
-static int wdt_stop (void)
+static int wdt_stop(void)
 {
         unsigned long flags;
         spin_lock_irqsave(&wdt_lock, flags);
         /* Turn the card off */
         inb_p(WDT_DC);                  /* Disable watchdog */
-        wdt_ctr_load(2,0);              /* 0 length reset pulses now */
+        wdt_ctr_load(2, 0);             /* 0 length reset pulses now */
         spin_unlock_irqrestore(&wdt_lock, flags);
         return 0;
 }
@@ -145,8 +154,8 @@ static int wdt_stop (void)
 /**
  *      wdt_ping:
  *
- *      Reload counter one with the watchdog heartbeat. We don't bother reloading
- *      the cascade counter.
+ *      Reload counter one with the watchdog heartbeat. We don't bother
+ *      reloading the cascade counter.
  */
 
 static int wdt_ping(void)
@@ -155,8 +164,9 @@ static int wdt_ping(void)
         spin_lock_irqsave(&wdt_lock, flags);
         /* Write a watchdog value */
         inb_p(WDT_DC);                  /* Disable watchdog */
-        wdt_ctr_mode(1,2);              /* Re-Program CTR1 for Mode 2: Rate Generator */
-        wdt_ctr_load(1,wd_heartbeat);   /* Heartbeat */
+        wdt_ctr_mode(1, 2);             /* Re-Program CTR1 for Mode 2:
+                                                        Rate Generator */
+        wdt_ctr_load(1, wd_heartbeat);  /* Heartbeat */
         outb_p(0, WDT_DC);              /* Enable watchdog */
         spin_unlock_irqrestore(&wdt_lock, flags);
         return 0;
@@ -166,13 +176,14 @@ static int wdt_ping(void)
  *      wdt_set_heartbeat:
  *      @t:             the new heartbeat value that needs to be set.
  *
- *      Set a new heartbeat value for the watchdog device. If the heartbeat value is
- *      incorrect we keep the old value and return -EINVAL. If successfull we
- *      return 0.
+ *      Set a new heartbeat value for the watchdog device. If the heartbeat
+ *      value is incorrect we keep the old value and return -EINVAL. If
+ *      successful we return 0.
  */
+
 static int wdt_set_heartbeat(int t)
 {
-        if ((t < 1) || (t > 65535))
+        if (t < 1 || t > 65535)
                 return -EINVAL;
 
         heartbeat = t;
@@ -200,7 +211,7 @@ static int wdt_get_status(int *status)
         new_status = inb_p(WDT_SR);
         spin_unlock_irqrestore(&wdt_lock, flags);
 
-        *status=0;
+        *status = 0;
         if (new_status & WDC_SR_ISOI0)
                 *status |= WDIOF_EXTERN1;
         if (new_status & WDC_SR_ISII1)
@@ -266,7 +277,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id)
 
 #ifdef CONFIG_WDT_501
         if (!(status & WDC_SR_TGOOD))
-                printk(KERN_CRIT "Overheat alarm.(%d)\n",inb_p(WDT_RT));
+                printk(KERN_CRIT "Overheat alarm.(%d)\n", inb_p(WDT_RT));
         if (!(status & WDC_SR_PSUOVER))
                 printk(KERN_CRIT "PSU over voltage.\n");
         if (!(status & WDC_SR_PSUUNDR))
@@ -304,9 +315,10 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id)
  *      write of data will do, as we we don't define content meaning.
  */
 
-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 (count) {
                 if (!nowayout) {
                         size_t i;
 
@@ -328,7 +340,6 @@ static ssize_t wdt_write(struct file *file, const char __user *buf, size_t count
 
 /**
  *      wdt_ioctl:
- *      @inode: inode of the device
  *      @file: file handle to the device
  *      @cmd: watchdog command
  *      @arg: argument pointer
@@ -338,8 +349,7 @@ static ssize_t wdt_write(struct file *file, const char __user *buf, size_t count
  *      querying capabilities and current status.
  */
 
-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;
@@ -362,32 +372,28 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 ident.options |= WDIOF_FANFAULT;
 #endif /* CONFIG_WDT_501 */
 
-        switch(cmd)
-        {
-                default:
-                        return -ENOTTY;
-                case WDIOC_GETSUPPORT:
-                        return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
-
-                case WDIOC_GETSTATUS:
-                        wdt_get_status(&status);
-                        return put_user(status, p);
-                case WDIOC_GETBOOTSTATUS:
-                        return put_user(0, p);
-                case WDIOC_KEEPALIVE:
-                        wdt_ping();
-                        return 0;
-                case WDIOC_SETTIMEOUT:
-                        if (get_user(new_heartbeat, p))
-                                return -EFAULT;
-
-                        if (wdt_set_heartbeat(new_heartbeat))
-                                return -EINVAL;
-
-                        wdt_ping();
-                        /* Fall */
-                case WDIOC_GETTIMEOUT:
-                        return put_user(heartbeat, p);
+        switch (cmd) {
+        default:
+                return -ENOTTY;
+        case WDIOC_GETSUPPORT:
+                return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
+        case WDIOC_GETSTATUS:
+                wdt_get_status(&status);
+                return put_user(status, p);
+        case WDIOC_GETBOOTSTATUS:
+                return put_user(0, p);
+        case WDIOC_KEEPALIVE:
+                wdt_ping();
+                return 0;
+        case WDIOC_SETTIMEOUT:
+                if (get_user(new_heartbeat, p))
+                        return -EFAULT;
+                if (wdt_set_heartbeat(new_heartbeat))
+                        return -EINVAL;
+                wdt_ping();
+                /* Fall */
+        case WDIOC_GETTIMEOUT:
+                return put_user(heartbeat, p);
         }
 }
 
@@ -405,7 +411,7 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
 static int wdt_open(struct inode *inode, struct file *file)
 {
-        if(test_and_set_bit(0, &wdt_is_open))
+        if (test_and_set_bit(0, &wdt_is_open))
                 return -EBUSY;
         /*
          *      Activate
@@ -432,7 +438,8 @@ static int wdt_release(struct inode *inode, struct file *file)
                 wdt_stop();
                 clear_bit(0, &wdt_is_open);
         } else {
-                printk(KERN_CRIT "wdt: WDT device closed unexpectedly.  WDT will not stop!\n");
+                printk(KERN_CRIT
+                 "wdt: WDT device closed unexpectedly.  WDT will not stop!\n");
                 wdt_ping();
         }
         expect_close = 0;
@@ -451,14 +458,15 @@ static int wdt_release(struct inode *inode, struct file *file)
  *      farenheit. It was designed by an imperial measurement luddite.
  */
 
-static ssize_t wdt_temp_read(struct file *file, char __user *buf, size_t count, loff_t *ptr)
+static ssize_t wdt_temp_read(struct file *file, char __user *buf,
+                                                size_t count, loff_t *ptr)
 {
         int temperature;
 
         if (wdt_get_temperature(&temperature))
                 return -EFAULT;
 
-        if (copy_to_user (buf, &temperature, 1))
+        if (copy_to_user(buf, &temperature, 1))
                 return -EFAULT;
 
         return 1;
@@ -506,10 +514,8 @@ static int wdt_temp_release(struct inode *inode, struct file *file)
 static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
         void *unused)
 {
-        if(code==SYS_DOWN || code==SYS_HALT) {
-                /* Turn the card off */
+        if (code == SYS_DOWN || code == SYS_HALT)
                 wdt_stop();
-        }
         return NOTIFY_DONE;
 }
 
@@ -522,7 +528,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_release,
 };
@@ -576,7 +582,7 @@ static void __exit wdt_exit(void)
 #endif /* CONFIG_WDT_501 */
         unregister_reboot_notifier(&wdt_notifier);
         free_irq(irq, NULL);
-        release_region(io,8);
+        release_region(io, 8);
 }
 
 /**
@@ -591,44 +597,49 @@ static int __init wdt_init(void)
 {
         int ret;
 
-        /* Check that the heartbeat value is within it's range ; if not reset to the default */
+        /* Check that the heartbeat value is within it's range;
+           if not reset to the default */
         if (wdt_set_heartbeat(heartbeat)) {
                 wdt_set_heartbeat(WD_TIMO);
-                printk(KERN_INFO "wdt: heartbeat value must be 0<heartbeat<65536, using %d\n",
+                printk(KERN_INFO "wdt: heartbeat value must be 0 < heartbeat < 65536, using %d\n",
                         WD_TIMO);
         }
 
         if (!request_region(io, 8, "wdt501p")) {
-                printk(KERN_ERR "wdt: I/O address 0x%04x already in use\n", io);
+                printk(KERN_ERR
+                        "wdt: I/O address 0x%04x already in use\n", io);
                 ret = -EBUSY;
                 goto out;
         }
 
         ret = request_irq(irq, wdt_interrupt, IRQF_DISABLED, "wdt501p", NULL);
-        if(ret) {
+        if (ret) {
                 printk(KERN_ERR "wdt: IRQ %d is not free.\n", irq);
                 goto outreg;
         }
 
         ret = register_reboot_notifier(&wdt_notifier);
-        if(ret) {
-                printk(KERN_ERR "wdt: cannot register reboot notifier (err=%d)\n", ret);
+        if (ret) {
+                printk(KERN_ERR
+                      "wdt: cannot register reboot notifier (err=%d)\n", ret);
                 goto outirq;
         }
 
 #ifdef CONFIG_WDT_501
         ret = misc_register(&temp_miscdev);
         if (ret) {
-                printk(KERN_ERR "wdt: cannot register miscdev on minor=%d (err=%d)\n",
-                        TEMP_MINOR, ret);
+                printk(KERN_ERR
+                        "wdt: cannot register miscdev on minor=%d (err=%d)\n",
+                                                        TEMP_MINOR, ret);
                 goto outrbt;
         }
 #endif /* CONFIG_WDT_501 */
 
         ret = misc_register(&wdt_miscdev);
         if (ret) {
-                printk(KERN_ERR "wdt: cannot register miscdev on minor=%d (err=%d)\n",
-                        WATCHDOG_MINOR, ret);
+                printk(KERN_ERR
+                        "wdt: cannot register miscdev on minor=%d (err=%d)\n",
+                                                        WATCHDOG_MINOR, ret);
                 goto outmisc;
         }
 
@@ -636,7 +647,8 @@ static int __init wdt_init(void)
         printk(KERN_INFO "WDT500/501-P driver 0.10 at 0x%04x (Interrupt %d). heartbeat=%d sec (nowayout=%d)\n",
                 io, irq, heartbeat, nowayout);
 #ifdef CONFIG_WDT_501
-        printk(KERN_INFO "wdt: Fan Tachometer is %s\n", (tachometer ? "Enabled" : "Disabled"));
+        printk(KERN_INFO "wdt: Fan Tachometer is %s\n",
+                                (tachometer ? "Enabled" : "Disabled"));
 #endif /* CONFIG_WDT_501 */
 
 out:
@@ -651,7 +663,7 @@ outrbt:
 outirq:
         free_irq(irq, NULL);
 outreg:
-        release_region(io,8);
+        release_region(io, 8);
         goto out;
 }