From: Andrew Morton <akpm@osdl.org>

- whitespace

- don't cast void*'s

- dont initalise platform_driver.owner

- don't use ushort.

Cc: Dave Updegraff <dave@cray.org>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/watchdog/mpc83xx_wdt.c |   51 ++++++++++++--------------
 1 files changed, 25 insertions(+), 26 deletions(-)

diff -puN drivers/char/watchdog/mpc83xx_wdt.c~powerpc-add-support-for-the-mpc83xx-watchdog-tidies drivers/char/watchdog/mpc83xx_wdt.c
--- 25/drivers/char/watchdog/mpc83xx_wdt.c~powerpc-add-support-for-the-mpc83xx-watchdog-tidies	Fri Jan 13 14:59:15 2006
+++ 25-akpm/drivers/char/watchdog/mpc83xx_wdt.c	Fri Jan 13 14:59:15 2006
@@ -41,7 +41,7 @@ struct mpc83xx_wdt {
 
 static struct mpc83xx_wdt __iomem *wd_base;
 
-static ushort timeout = 0xffff;
+static u16 timeout = 0xffff;
 module_param(timeout, ushort, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout in ticks. (0<timeout<65536, default=65535");
 
@@ -49,7 +49,10 @@ static int reset = 1;
 module_param(reset, bool, 0);
 MODULE_PARM_DESC(reset, "Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset");
 
-/* We always prescale, but if someone really doesn't want to they can set this to 0 */
+/*
+ * We always prescale, but if someone really doesn't want to they can set this
+ * to 0
+ */
 static int prescale = 1;
 static unsigned int timeout_sec;
 
@@ -65,15 +68,15 @@ static void mpc83xx_wdt_keepalive(void)
 	spin_unlock(&wdt_spinlock);
 }
 
-static ssize_t mpc83xx_wdt_write(struct file * file, const char __user * buf,
-				 size_t count, loff_t * ppos)
+static ssize_t mpc83xx_wdt_write(struct file *file, const char __user *buf,
+				 size_t count, loff_t *ppos)
 {
-	if(count)
+	if (count)
 		mpc83xx_wdt_keepalive();
 	return count;
 }
 
-static int mpc83xx_wdt_open(struct inode * inode, struct file * file)
+static int mpc83xx_wdt_open(struct inode *inode, struct file *file)
 {
 	u32 tmp = SWCRR_SWEN;
 	if (test_and_set_bit(0, &wdt_is_open))
@@ -95,7 +98,7 @@ static int mpc83xx_wdt_open(struct inode
 	return nonseekable_open(inode, file);
 }
 
-static int mpc83xx_wdt_release(struct inode * inode, struct file * file)
+static int mpc83xx_wdt_release(struct inode *inode, struct file *file)
 {
 	printk(KERN_CRIT "Unexpected close, not stopping watchdog!\n");
 	mpc83xx_wdt_keepalive();
@@ -104,8 +107,7 @@ static int mpc83xx_wdt_release(struct in
 }
 
 static int mpc83xx_wdt_ioctl(struct inode *inode, struct file *file,
-			     unsigned int cmd,
-	unsigned long arg)
+				unsigned int cmd, unsigned long arg)
 {
 	void __user *argp = (void __user *)arg;
 	int __user *p = argp;
@@ -115,18 +117,16 @@ static int mpc83xx_wdt_ioctl(struct inod
 		.identity = "MPC83xx",
 	};
 
-	switch(cmd)
-	{
-		case WDIOC_GETSUPPORT:
-			return copy_to_user(argp, &ident, sizeof(ident))?-EFAULT:0;
-		case WDIOC_KEEPALIVE:
-			mpc83xx_wdt_keepalive();
-			return 0;
-		case WDIOC_GETTIMEOUT:
-			return put_user(timeout_sec, p);
-
-		default:
-			return -ENOIOCTLCMD;
+	switch (cmd) {
+	case WDIOC_GETSUPPORT:
+		return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
+	case WDIOC_KEEPALIVE:
+		mpc83xx_wdt_keepalive();
+		return 0;
+	case WDIOC_GETTIMEOUT:
+		return put_user(timeout_sec, p);
+	default:
+		return -ENOIOCTLCMD;
 	}
 }
 
@@ -159,8 +159,7 @@ static int __devinit mpc83xx_wdt_probe(s
 		goto err_out;
 	}
 
-	wd_base = (struct mpc83xx_wdt *)
-		ioremap(r->start, sizeof (struct mpc83xx_wdt));
+	wd_base = ioremap(r->start, sizeof (struct mpc83xx_wdt));
 
 	if (wd_base == NULL) {
 		ret = -ENOMEM;
@@ -169,8 +168,9 @@ static int __devinit mpc83xx_wdt_probe(s
 
 	ret = misc_register(&mpc83xx_wdt_miscdev);
 	if (ret) {
-		printk(KERN_ERR "cannot register miscdev on minor=%d (err=%d)\n",
-			   WATCHDOG_MINOR, ret);
+		printk(KERN_ERR "cannot register miscdev on minor=%d "
+				"(err=%d)\n",
+				WATCHDOG_MINOR, ret);
 		goto err_unmap;
 	}
 
@@ -206,7 +206,6 @@ static struct platform_driver mpc83xx_wd
 	.probe		= mpc83xx_wdt_probe,
 	.remove		= __devexit_p(mpc83xx_wdt_remove),
 	.driver		= {
-		.owner	= THIS_MODULE,
 		.name	= "mpc83xx_wdt",
 	},
 };
_