1 files changed, 20 insertions, 19 deletions

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index ebc2bae6c289..5c1e4242368b 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -114,14 +114,14 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
                 int size = sizeof(*dcbuf);
 
                 if  ( nbytes < sizeof(struct coda_out_hdr) ) {
-                        printk("coda_downcall opc %d uniq %d, not enough!\n",
-                               hdr.opcode, hdr.unique);
+                        pr_warn("coda_downcall opc %d uniq %d, not enough!\n",
+                                hdr.opcode, hdr.unique);
                         count = nbytes;
                         goto out;
                 }
                 if ( nbytes > size ) {
-                        printk("Coda: downcall opc %d, uniq %d, too much!",
-                               hdr.opcode, hdr.unique);
+                        pr_warn("downcall opc %d, uniq %d, too much!",
+                                hdr.opcode, hdr.unique);
                         nbytes = size;
                 }
                 CODA_ALLOC(dcbuf, union outputArgs *, nbytes);
@@ -136,7 +136,8 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
 
                 CODA_FREE(dcbuf, nbytes);
                 if (error) {
-                        printk("psdev_write: coda_downcall error: %d\n", error);
+                        pr_warn("%s: coda_downcall error: %d\n",
+                                __func__, error);
                         retval = error;
                         goto out;
                 }
@@ -157,16 +158,17 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf,
         mutex_unlock(&vcp->vc_mutex);
 
         if (!req) {
-                printk("psdev_write: msg (%d, %d) not found\n", 
-                        hdr.opcode, hdr.unique);
+                pr_warn("%s: msg (%d, %d) not found\n",
+                        __func__, hdr.opcode, hdr.unique);
                 retval = -ESRCH;
                 goto out;
         }
 
         /* move data into response buffer. */
         if (req->uc_outSize < nbytes) {
-                printk("psdev_write: too much cnt: %d, cnt: %ld, opc: %d, uniq: %d.\n",
-                       req->uc_outSize, (long)nbytes, hdr.opcode, hdr.unique);
+                pr_warn("%s: too much cnt: %d, cnt: %ld, opc: %d, uniq: %d.\n",
+                        __func__, req->uc_outSize, (long)nbytes,
+                        hdr.opcode, hdr.unique);
                 nbytes = req->uc_outSize; /* don't have more space! */
         }
         if (copy_from_user(req->uc_data, buf, nbytes)) {
@@ -240,8 +242,8 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf,
         /* Move the input args into userspace */
         count = req->uc_inSize;
         if (nbytes < req->uc_inSize) {
-                printk ("psdev_read: Venus read %ld bytes of %d in message\n",
-                        (long)nbytes, req->uc_inSize);
+                pr_warn("%s: Venus read %ld bytes of %d in message\n",
+                        __func__, (long)nbytes, req->uc_inSize);
                 count = nbytes;
         }
 
@@ -305,7 +307,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file)
         struct upc_req *req, *tmp;
 
         if (!vcp || !vcp->vc_inuse ) {
-                printk("psdev_release: Not open.\n");
+                pr_warn("%s: Not open.\n", __func__);
                 return -1;
         }
 
@@ -354,8 +356,8 @@ static int init_coda_psdev(void)
 {
         int i, err = 0;
         if (register_chrdev(CODA_PSDEV_MAJOR, "coda", &coda_psdev_fops)) {
-              printk(KERN_ERR "coda_psdev: unable to get major %d\n", 
-                     CODA_PSDEV_MAJOR);
+                pr_err("%s: unable to get major %d\n",
+                       __func__, CODA_PSDEV_MAJOR);
               return -EIO;
         }
         coda_psdev_class = class_create(THIS_MODULE, "coda");
@@ -393,13 +395,13 @@ static int __init init_coda(void)
                 goto out2;
         status = init_coda_psdev();
         if ( status ) {
-                printk("Problem (%d) in init_coda_psdev\n", status);
+                pr_warn("Problem (%d) in init_coda_psdev\n", status);
                 goto out1;
         }
         
         status = register_filesystem(&coda_fs_type);
         if (status) {
-                printk("coda: failed to register filesystem!\n");
+                pr_warn("failed to register filesystem!\n");
                 goto out;
         }
         return 0;
@@ -420,9 +422,8 @@ static void __exit exit_coda(void)
         int err, i;
 
         err = unregister_filesystem(&coda_fs_type);
-        if ( err != 0 ) {
-                printk("coda: failed to unregister filesystem\n");
-        }
+        if (err != 0)
+                pr_warn("failed to unregister filesystem\n");
         for (i = 0; i < MAX_CODADEVS; i++)
                 device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
         class_destroy(coda_psdev_class);