Merge git://git.infradead.org/mtd-2.6

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

diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 44e81f7d4322909b168b691edb0c6d320419f2c0..42e940c238914172e199d5e232369ccc33ccf35e 100644 (file)
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -1,17 +1,17 @@
 /*
  *     ICP Wafer 5823 Single Board Computer WDT driver
- *      http://www.icpamerica.com/wafer_5823.php
- *      May also work on other similar models
+ *     http://www.icpamerica.com/wafer_5823.php
+ *     May also work on other similar models
  *
  *     (c) Copyright 2002 Justin Cormack <justin@street-vision.com>
  *
- *      Release 0.02
+ *     Release 0.02
  *
  *     Based on advantechwdt.c which is based on wdt.c.
  *     Original copyright messages:
  *
- *     (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *                             http://www.redhat.com
+ *     (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                             All Rights Reserved.
  *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
@@ -50,10 +50,10 @@ static DEFINE_SPINLOCK(wafwdt_lock);
 /*
  *     You must set these - there is no sane way to probe for this board.
  *
- *      To enable, write the timeout value in seconds (1 to 255) to I/O
- *      port WDT_START, then read the port to start the watchdog. To pat
- *      the dog, read port WDT_STOP to stop the timer, then read WDT_START
- *      to restart it again.
+ *     To enable, write the timeout value in seconds (1 to 255) to I/O
+ *     port WDT_START, then read the port to start the watchdog. To pat
+ *     the dog, read port WDT_STOP to stop the timer, then read WDT_START
+ *     to restart it again.
  */
 
 static int wdt_stop = 0x843;
@@ -87,8 +87,7 @@ static void wafwdt_start(void)
        inb_p(wdt_start);
 }
 
-static void
-wafwdt_stop(void)
+static void wafwdt_stop(void)
 {
        /* stop watchdog */
        inb_p(wdt_stop);
@@ -199,8 +198,7 @@ static int wafwdt_open(struct inode *inode, struct file *file)
        return nonseekable_open(inode, file);
 }
 
-static int
-wafwdt_close(struct inode *inode, struct file *file)
+static int wafwdt_close(struct inode *inode, struct file *file)
 {
        if (expect_close == 42)
                wafwdt_stop();