watchdog: twl4030_wdt: Disable watchdog during probing

[safe/jmp/linux-2.6] / drivers / watchdog / alim1535_wdt.c

diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
index 80e323d..1e9caea 100644 (file)
--- a/drivers/watchdog/alim1535_wdt.c
+++ b/drivers/watchdog/alim1535_wdt.c
@@ -60,7 +60,7 @@ static void ali_start(void)
 
        pci_read_config_dword(ali_pci, 0xCC, &val);
        val &= ~0x3F;   /* Mask count */
-       val |= (1<<25) | ali_timeout_bits;
+       val |= (1 << 25) | ali_timeout_bits;
        pci_write_config_dword(ali_pci, 0xCC, val);
 
        spin_unlock(&ali_lock);
@@ -79,8 +79,8 @@ static void ali_stop(void)
        spin_lock(&ali_lock);
 
        pci_read_config_dword(ali_pci, 0xCC, &val);
-       val &= ~0x3F;   /* Mask count to zero (disabled) */
-       val &= ~(1<<25);/* and for safety mask the reset enable */
+       val &= ~0x3F;           /* Mask count to zero (disabled) */
+       val &= ~(1 << 25);      /* and for safety mask the reset enable */
        pci_write_config_dword(ali_pci, 0xCC, val);
 
        spin_unlock(&ali_lock);
@@ -89,7 +89,7 @@ static void ali_stop(void)
 /*
  *     ali_keepalive   -       send a keepalive to the watchdog
  *
- *      Send a keepalive to the timer (actually we restart the timer).
+ *     Send a keepalive to the timer (actually we restart the timer).
  */
 
 static void ali_keepalive(void)
@@ -109,11 +109,11 @@ static int ali_settimer(int t)
        if (t < 0)
                return -EINVAL;
        else if (t < 60)
-               ali_timeout_bits = t|(1<<6);
+               ali_timeout_bits = t|(1 << 6);
        else if (t < 3600)
-               ali_timeout_bits = (t/60)|(1<<7);
+               ali_timeout_bits = (t / 60)|(1 << 7);
        else if (t < 18000)
-               ali_timeout_bits = (t/300)|(1<<6)|(1<<7);
+               ali_timeout_bits = (t / 300)|(1 << 6)|(1 << 7);
        else
                return -EINVAL;
 
@@ -138,7 +138,7 @@ static int ali_settimer(int t)
  */
 
 static ssize_t ali_write(struct file *file, const char __user *data,
-                             size_t len, loff_t *ppos)
+                                               size_t len, loff_t *ppos)
 {
        /* See if we got the magic character 'V' and reload the timer */
        if (len) {
@@ -153,7 +153,7 @@ static ssize_t ali_write(struct file *file, const char __user *data,
                           the magic character */
                        for (i = 0; i != len; i++) {
                                char c;
-                               if (get_user(c, data+i))
+                               if (get_user(c, data + i))
                                        return -EFAULT;
                                if (c == 'V')
                                        ali_expect_release = 42;
@@ -180,7 +180,7 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        void __user *argp = (void __user *)arg;
        int __user *p = argp;
-       static struct watchdog_info ident = {
+       static const struct watchdog_info ident = {
                .options =              WDIOF_KEEPALIVEPING |
                                        WDIOF_SETTIMEOUT |
                                        WDIOF_MAGICCLOSE,
@@ -195,9 +195,6 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case WDIOC_GETSTATUS:
        case WDIOC_GETBOOTSTATUS:
                return put_user(0, p);
-       case WDIOC_KEEPALIVE:
-               ali_keepalive();
-               return 0;
        case WDIOC_SETOPTIONS:
        {
                int new_options, retval = -EINVAL;
@@ -214,6 +211,9 @@ static long ali_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                }
                return retval;
        }
+       case WDIOC_KEEPALIVE:
+               ali_keepalive();
+               return 0;
        case WDIOC_SETTIMEOUT:
        {
                int new_timeout;
@@ -348,9 +348,9 @@ static int __init ali_find_watchdog(void)
        /* Timer bits */
        wdog &= ~0x3F;
        /* Issued events */
-       wdog &= ~((1<<27)|(1<<26)|(1<<25)|(1<<24));
+       wdog &= ~((1 << 27)|(1 << 26)|(1 << 25)|(1 << 24));
        /* No monitor bits */
-       wdog &= ~((1<<16)|(1<<13)|(1<<12)|(1<<11)|(1<<10)|(1<<9));
+       wdog &= ~((1 << 16)|(1 << 13)|(1 << 12)|(1 << 11)|(1 << 10)|(1 << 9));
 
        pci_write_config_dword(pdev, 0xCC, wdog);