[WATCHDOG] More coding-style and trivial clean-up

Some more cleaning-up of the watchdog drivers.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 3e57aa4d643a33035fb7f6f37a494ac9148211de..4d18c874d963a1efa4b2168540590cb8864da453 100644 (file)
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -1,7 +1,7 @@
 /*
  *     Acquire Single Board Computer Watchdog Timer driver
  *
- *      Based on wdt.c. Original copyright messages:
+ *     Based on wdt.c. Original copyright messages:
  *
  *     (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
  *                                             All Rights Reserved.
@@ -17,9 +17,9 @@
  *
  *     (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
  *
- *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
- *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
- *          Can't add timeout - driver doesn't allow changing value
+ *     14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
+ *         Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
+ *         Can't add timeout - driver doesn't allow changing value
  */
 
 /*

diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index a1d7856ea6e0adaccfd974b5aaddd52225fc2e6a..824d076a5cd6d092ff7e1793f05ec57545f10c57 100644 (file)
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -138,7 +138,9 @@ static long advwdt_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 = {
-               .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
+               .options = WDIOF_KEEPALIVEPING |
+                          WDIOF_SETTIMEOUT |
+                          WDIOF_MAGICCLOSE,
                .firmware_version = 1,
                .identity = WATCHDOG_NAME,
        };
@@ -259,7 +261,8 @@ static int __devinit advwdt_probe(struct platform_device *dev)
                goto unreg_stop;
        }
 
-       /* 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 (advwdt_set_heartbeat(timeout)) {
                advwdt_set_heartbeat(WATCHDOG_TIMEOUT);
                printk(KERN_INFO PFX

diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
index 2a7690ecf97d7b1385ef68edb89c8587f3b8faea..937a80fb61e124d96feaf014da38e4b4c194ec3b 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) {
@@ -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);
 

diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index a045ef869439345dd3ab9d27794721fa2c09d443..90f98df5f106231d636326f3699a43df80e26519 100644 (file)
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -355,7 +355,8 @@ static int __init alim7101_wdt_init(void)
        alim7101_pmu = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,
                NULL);
        if (!alim7101_pmu) {
-               printk(KERN_INFO PFX "ALi M7101 PMU not present - WDT not set\n");
+               printk(KERN_INFO PFX
+                       "ALi M7101 PMU not present - WDT not set\n");
                return -EBUSY;
        }
 
@@ -399,7 +400,8 @@ static int __init alim7101_wdt_init(void)
 
        rc = misc_register(&wdt_miscdev);
        if (rc) {
-               printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
+               printk(KERN_ERR PFX
+                       "cannot register miscdev on minor=%d (err=%d)\n",
                        wdt_miscdev.minor, rc);
                goto err_out_reboot;
        }

diff --cc drivers/watchdog/at91sam9_wdt.c
Simple merge

diff --cc drivers/watchdog/eurotechwdt.c
Simple merge

diff --cc drivers/watchdog/geodewdt.c
Simple merge

diff --cc drivers/watchdog/hpwdt.c
Simple merge

diff --cc drivers/watchdog/i6300esb.c
Simple merge

diff --cc drivers/watchdog/iTCO_vendor_support.c
Simple merge

diff --cc drivers/watchdog/iTCO_wdt.c
Simple merge

diff --cc drivers/watchdog/it87_wdt.c
Simple merge

diff --cc drivers/watchdog/mpc5200_wdt.c
Simple merge

diff --cc drivers/watchdog/mpcore_wdt.c
Simple merge

diff --cc drivers/watchdog/mtx-1_wdt.c
Simple merge

diff --cc drivers/watchdog/pc87413_wdt.c
Simple merge

diff --cc drivers/watchdog/pcwd.c
Simple merge

diff --cc drivers/watchdog/pcwd_pci.c
Simple merge

diff --cc drivers/watchdog/pcwd_usb.c
Simple merge

diff --cc drivers/watchdog/pnx4008_wdt.c
Simple merge

diff --cc drivers/watchdog/riowd.c
Simple merge

diff --cc drivers/watchdog/sa1100_wdt.c
Simple merge

diff --cc drivers/watchdog/sbc60xxwdt.c
Simple merge

diff --cc drivers/watchdog/sbc8360.c
Simple merge

diff --cc drivers/watchdog/sbc_epx_c3.c
Simple merge

diff --cc drivers/watchdog/sc1200wdt.c
Simple merge

diff --cc drivers/watchdog/sc520_wdt.c
Simple merge

diff --cc drivers/watchdog/smsc37b787_wdt.c
Simple merge

diff --cc drivers/watchdog/softdog.c
Simple merge

diff --cc drivers/watchdog/w83697hf_wdt.c
Simple merge

diff --cc drivers/watchdog/w83697ug_wdt.c
Simple merge

diff --cc drivers/watchdog/w83977f_wdt.c
Simple merge

diff --cc drivers/watchdog/wd501p.h
Simple merge

diff --cc drivers/watchdog/wdt977.c
Simple merge