USB: legotower: remove direct calls to printk()
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Jun 2013 23:30:42 +0000 (16:30 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Jul 2013 23:10:02 +0000 (16:10 -0700)
Use the pr_* calls instead, which are much more descriptive.

Cc: Juergen Stuber <starblue@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/misc/legousbtower.c

index 6df99dc..eb37c95 100644 (file)
@@ -75,6 +75,8 @@
  *   - move reset into open to clean out spurious data
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -325,8 +327,7 @@ static int tower_open (struct inode *inode, struct file *file)
        interface = usb_find_interface (&tower_driver, subminor);
 
        if (!interface) {
-               printk(KERN_ERR "%s - error, can't find device for minor %d\n",
-                      __func__, subminor);
+               pr_err("error, can't find device for minor %d\n", subminor);
                retval = -ENODEV;
                goto exit;
        }
@@ -563,7 +564,7 @@ static ssize_t tower_read (struct file *file, char __user *buffer, size_t count,
        /* verify that the device wasn't unplugged */
        if (dev->udev == NULL) {
                retval = -ENODEV;
-               printk(KERN_ERR "legousbtower: No device or device unplugged %d\n", retval);
+               pr_err("No device or device unplugged %d\n", retval);
                goto unlock_exit;
        }
 
@@ -649,7 +650,7 @@ static ssize_t tower_write (struct file *file, const char __user *buffer, size_t
        /* verify that the device wasn't unplugged */
        if (dev->udev == NULL) {
                retval = -ENODEV;
-               printk(KERN_ERR "legousbtower: No device or device unplugged %d\n", retval);
+               pr_err("No device or device unplugged %d\n", retval);
                goto unlock_exit;
        }
 
@@ -748,7 +749,8 @@ static void tower_interrupt_in_callback (struct urb *urb)
                        dev_dbg(&dev->udev->dev, "%s: received %d bytes\n",
                                __func__, urb->actual_length);
                } else {
-                       printk(KERN_WARNING "%s: read_buffer overflow, %d bytes dropped", __func__, urb->actual_length);
+                       pr_warn("read_buffer overflow, %d bytes dropped\n",
+                               urb->actual_length);
                }
                spin_unlock (&dev->read_buffer_lock);
        }