1 files changed, 11 insertions, 18 deletions

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index c84c34fb1231..432655bcb04c 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -114,8 +114,7 @@ static ssize_t pp_read (struct file * file, char __user * buf, size_t count,
 
         if (!(pp->flags & PP_CLAIMED)) {
                 /* Don't have the port claimed */
-                printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                        minor);
+                pr_debug(CHRDEV "%x: claim the port first\n", minor);
                 return -EINVAL;
         }
 
@@ -198,8 +197,7 @@ static ssize_t pp_write (struct file * file, const char __user * buf,
 
         if (!(pp->flags & PP_CLAIMED)) {
                 /* Don't have the port claimed */
-                printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                        minor);
+                pr_debug(CHRDEV "%x: claim the port first\n", minor);
                 return -EINVAL;
         }
 
@@ -313,7 +311,7 @@ static int register_device (int minor, struct pp_struct *pp)
         }
 
         pp->pdev = pdev;
-        printk (KERN_DEBUG "%s: registered pardevice\n", name);
+        pr_debug("%s: registered pardevice\n", name);
         return 0;
 }
 
@@ -343,8 +341,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 int ret;
 
                 if (pp->flags & PP_CLAIMED) {
-                        printk (KERN_DEBUG CHRDEV
-                                "%x: you've already got it!\n", minor);
+                        pr_debug(CHRDEV "%x: you've already got it!\n", minor);
                         return -EINVAL;
                 }
 
@@ -379,7 +376,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
             }
         case PPEXCL:
                 if (pp->pdev) {
-                        printk (KERN_DEBUG CHRDEV "%x: too late for PPEXCL; "
+                        pr_debug(CHRDEV "%x: too late for PPEXCL; "
                                 "already registered\n", minor);
                         if (pp->flags & PP_EXCL)
                                 /* But it's not really an error. */
@@ -491,8 +488,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         /* Everything else requires the port to be claimed, so check
          * that now. */
         if ((pp->flags & PP_CLAIMED) == 0) {
-                printk (KERN_DEBUG CHRDEV "%x: claim the port first\n",
-                        minor);
+                pr_debug(CHRDEV "%x: claim the port first\n", minor);
                 return -EINVAL;
         }
 
@@ -624,8 +620,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 return 0;
 
         default:
-                printk (KERN_DEBUG CHRDEV "%x: What? (cmd=0x%x)\n", minor,
-                        cmd);
+                pr_debug(CHRDEV "%x: What? (cmd=0x%x)\n", minor, cmd);
                 return -EINVAL;
         }
 
@@ -698,9 +693,8 @@ static int pp_release (struct inode * inode, struct file * file)
         }
         if (compat_negot) {
                 parport_negotiate (pp->pdev->port, IEEE1284_MODE_COMPAT);
-                printk (KERN_DEBUG CHRDEV
-                        "%x: negotiated back to compatibility mode because "
-                        "user-space forgot\n", minor);
+                pr_debug(CHRDEV "%x: negotiated back to compatibility "
+                        "mode because user-space forgot\n", minor);
         }
 
         if (pp->flags & PP_CLAIMED) {
@@ -713,7 +707,7 @@ static int pp_release (struct inode * inode, struct file * file)
                 info->phase = pp->saved_state.phase;
                 parport_release (pp->pdev);
                 if (compat_negot != 1) {
-                        printk (KERN_DEBUG CHRDEV "%x: released pardevice "
+                        pr_debug(CHRDEV "%x: released pardevice "
                                 "because user-space forgot\n", minor);
                 }
         }
@@ -723,8 +717,7 @@ static int pp_release (struct inode * inode, struct file * file)
                 parport_unregister_device (pp->pdev);
                 kfree (name);
                 pp->pdev = NULL;
-                printk (KERN_DEBUG CHRDEV "%x: unregistered pardevice\n",
-                        minor);
+                pr_debug(CHRDEV "%x: unregistered pardevice\n", minor);
         }
 
         kfree (pp);