This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / mwave / mwavedd.c

diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
index 2983c27..7f54c84 100644 (file)
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
@@ -94,8 +94,8 @@ static int mwave_open(struct inode *inode, struct file *file)
        unsigned int retval = 0;
 
        PRINTK_3(TRACE_MWAVE,
-               "mwavedd::mwave_open, entry inode %p file %p\n",
-                inode, file);
+               "mwavedd::mwave_open, entry inode %x file %x\n",
+               (int) inode, (int) file);
        PRINTK_2(TRACE_MWAVE,
                "mwavedd::mwave_open, exit return retval %x\n", retval);
 
@@ -107,8 +107,8 @@ static int mwave_close(struct inode *inode, struct file *file)
        unsigned int retval = 0;
 
        PRINTK_3(TRACE_MWAVE,
-               "mwavedd::mwave_close, entry inode %p file %p\n",
-                inode,  file);
+               "mwavedd::mwave_close, entry inode %x file %x\n",
+               (int) inode, (int) file);
 
        PRINTK_2(TRACE_MWAVE, "mwavedd::mwave_close, exit retval %x\n",
                retval);
@@ -124,8 +124,8 @@ static int mwave_ioctl(struct inode *inode, struct file *file,
        void __user *arg = (void __user *)ioarg;
 
        PRINTK_5(TRACE_MWAVE,
-               "mwavedd::mwave_ioctl, entry inode %p file %p cmd %x arg %x\n",
-                inode,  file, iocmd, (int) ioarg);
+               "mwavedd::mwave_ioctl, entry inode %x file %x cmd %x arg %x\n",
+               (int) inode, (int) file, iocmd, (int) ioarg);
 
        switch (iocmd) {
 
@@ -179,7 +179,7 @@ static int mwave_ioctl(struct inode *inode, struct file *file,
                case IOCTL_MW_READ_DATA:
                case IOCTL_MW_READCLEAR_DATA: {
                        MW_READWRITE rReadData;
-                       unsigned short __user *pusBuffer = NULL;
+                       unsigned short __user *pusBuffer = 0;
        
                        if( copy_from_user(&rReadData, arg,
                                                sizeof(MW_READWRITE)) )
@@ -200,7 +200,7 @@ static int mwave_ioctl(struct inode *inode, struct file *file,
        
                case IOCTL_MW_READ_INST: {
                        MW_READWRITE rReadData;
-                       unsigned short __user *pusBuffer = NULL;
+                       unsigned short __user *pusBuffer = 0;
        
                        if( copy_from_user(&rReadData, arg,
                                                sizeof(MW_READWRITE)) )
@@ -221,7 +221,7 @@ static int mwave_ioctl(struct inode *inode, struct file *file,
        
                case IOCTL_MW_WRITE_DATA: {
                        MW_READWRITE rWriteData;
-                       unsigned short __user *pusBuffer = NULL;
+                       unsigned short __user *pusBuffer = 0;
        
                        if( copy_from_user(&rWriteData, arg,
                                                sizeof(MW_READWRITE)) )
@@ -242,7 +242,7 @@ static int mwave_ioctl(struct inode *inode, struct file *file,
        
                case IOCTL_MW_WRITE_INST: {
                        MW_READWRITE rWriteData;
-                       unsigned short __user *pusBuffer = NULL;
+                       unsigned short __user *pusBuffer = 0;
        
                        if( copy_from_user(&rWriteData, arg,
                                                sizeof(MW_READWRITE)) )
@@ -389,7 +389,7 @@ static ssize_t mwave_read(struct file *file, char __user *buf, size_t count,
                           loff_t * ppos)
 {
        PRINTK_5(TRACE_MWAVE,
-               "mwavedd::mwave_read entry file %p, buf %p, count %zx ppos %p\n",
+               "mwavedd::mwave_read entry file %p, buf %p, count %x ppos %p\n",
                file, buf, count, ppos);
 
        return -EINVAL;
@@ -401,7 +401,7 @@ static ssize_t mwave_write(struct file *file, const char __user *buf,
 {
        PRINTK_5(TRACE_MWAVE,
                "mwavedd::mwave_write entry file %p, buf %p,"
-               " count %zx ppos %p\n",
+               " count %x ppos %p\n",
                file, buf, count, ppos);
 
        return -EINVAL;