Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bad77057ed59892bd5c7807dcf0c2500e5ff1fe7
Commit:     bad77057ed59892bd5c7807dcf0c2500e5ff1fe7
Parent:     6a3d039078b337856bd3cfa436be3b1b223440a5
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Sun Mar 18 01:26:10 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Mar 18 11:35:07 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Cc: Al Viro <[EMAIL PROTECTED]>
    Acked-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/char/watchdog/machzwd.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 81fb3de..76c7fa3 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to