[PATCH] machzwd warning fix

drivers/char/watchdog/machzwd.c: In function 'zf_ioctl':
drivers/char/watchdog/machzwd.c:327: warning: passing argument 1 of 'zf_ping' makes integer from pointer without a cast

Also some coding-style repairs.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ftp.linux.org.uk>
Acked-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 81fb3dec180f..76c7fa37fa6c 100644
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -314,21 +314,21 @@ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 {
         void __user *argp = (void __user *)arg;
         int __user *p = argp;
-        switch(cmd){
-                case WDIOC_GETSUPPORT:
-                        if (copy_to_user(argp, &zf_info, sizeof(zf_info)))
-                                return -EFAULT;
-                        break;
+        switch (cmd) {
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user(argp, &zf_info, sizeof(zf_info)))
+                        return -EFAULT;
+                break;
 
-                case WDIOC_GETSTATUS:
-                        return put_user(0, p);
+        case WDIOC_GETSTATUS:
+                return put_user(0, p);
 
-                case WDIOC_KEEPALIVE:
-                        zf_ping(NULL);
-                        break;
+        case WDIOC_KEEPALIVE:
+                zf_ping(0);
+                break;
 
-                default:
-                        return -ENOTTY;
+        default:
+                return -ENOTTY;
         }
 
         return 0;