drivers/video/msm: update to new kernel

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

diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index 239383d..8a1f0bc 100644 (file)
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -1,8 +1,8 @@
 /*
  *     SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
  *
- *      Based on acquirewdt.c by Alan Cox <alan@redhat.com>
- *       and some other existing drivers
+ *     Based on acquirewdt.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
+ *     and some other existing drivers
  *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
@@ -11,7 +11,7 @@
  *
  *     The authors do NOT admit liability nor provide warranty for
  *     any of this software. This material is provided "AS-IS" in
- *      the hope that it may be useful for others.
+ *     the hope that it may be useful for others.
  *
  *     (C) Copyright 2003-2006  Sven Anders <anders@anduras.de>
  *
@@ -22,19 +22,19 @@
  *
  *  Theory of operation:
  *
- *      A Watchdog Timer (WDT) is a hardware circuit that can
- *      reset the computer system in case of a software fault.
- *      You probably knew that already.
+ *     A Watchdog Timer (WDT) is a hardware circuit that can
+ *     reset the computer system in case of a software fault.
+ *     You probably knew that already.
  *
- *      Usually a userspace daemon will notify the kernel WDT driver
- *      via the /dev/watchdog special device file that userspace is
- *      still alive, at regular intervals.  When such a notification
- *      occurs, the driver will usually tell the hardware watchdog
- *      that everything is in order, and that the watchdog should wait
- *      for yet another little while to reset the system.
- *      If userspace fails (RAM error, kernel bug, whatever), the
- *      notifications cease to occur, and the hardware watchdog will
- *      reset the system (causing a reboot) after the timeout occurs.
+ *     Usually a userspace daemon will notify the kernel WDT driver
+ *     via the /dev/watchdog special device file that userspace is
+ *     still alive, at regular intervals.  When such a notification
+ *     occurs, the driver will usually tell the hardware watchdog
+ *     that everything is in order, and that the watchdog should wait
+ *     for yet another little while to reset the system.
+ *     If userspace fails (RAM error, kernel bug, whatever), the
+ *     notifications cease to occur, and the hardware watchdog will
+ *     reset the system (causing a reboot) after the timeout occurs.
  *
  * Create device with:
  *  mknod /dev/watchdog c 10 130
@@ -408,7 +408,7 @@ static ssize_t wb_smsc_wdt_write(struct file *file, const char __user *data,
                           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')
                                        expect_close = 42;
@@ -438,7 +438,7 @@ static long wb_smsc_wdt_ioctl(struct file *file,
                                        WDIOF_SETTIMEOUT |
                                        WDIOF_MAGICCLOSE,
                .firmware_version =     0,
-               .identity =             "SMsC 37B787 Watchdog"
+               .identity =             "SMsC 37B787 Watchdog",
        };
 
        uarg.i = (int __user *)arg;
@@ -485,7 +485,7 @@ static long wb_smsc_wdt_ioctl(struct file *file,
        case WDIOC_GETTIMEOUT:
                new_timeout = timeout;
                if (unit == UNIT_MINUTE)
-                         new_timeout *= 60;
+                       new_timeout *= 60;
                return put_user(new_timeout, uarg.i);
        default:
                return -ENOTTY;