PCI: remove unused resource assignment in pci_read_bridge_bases()

[linux-2.6-omap-h63xx.git] / drivers / watchdog / w83697hf_wdt.c

diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index 12bd6618ed5e75d2ce19d94eb86e9f4c2ccaaaea..445d30a01ed310858a4fda9babb590125496cc11 100644 (file)
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -218,7 +218,7 @@ static ssize_t wdt_write(struct file *file, const char __user *buf,
 
                        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;
@@ -325,10 +325,9 @@ static int wdt_close(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 WDT off */
-               wdt_disable();
-       }
+       if (code == SYS_DOWN || code == SYS_HALT)
+               wdt_disable();  /* Turn the WDT off */
+
        return NOTIFY_DONE;
 }
 
@@ -414,7 +413,7 @@ static int __init wdt_init(void)
        w83697hf_init();
        if (early_disable) {
                if (wdt_running())
-                       printk (KERN_WARNING PFX "Stopping previously enabled watchdog until userland kicks in\n");
+                       printk(KERN_WARNING PFX "Stopping previously enabled watchdog until userland kicks in\n");
                wdt_disable();
        }