diff options
Diffstat (limited to 'applied/usb-legotower-remove-direct-calls-to-printk.patch')
| -rw-r--r-- | applied/usb-legotower-remove-direct-calls-to-printk.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/applied/usb-legotower-remove-direct-calls-to-printk.patch b/applied/usb-legotower-remove-direct-calls-to-printk.patch new file mode 100644 index 00000000000000..de03d6ee712f12 --- /dev/null +++ b/applied/usb-legotower-remove-direct-calls-to-printk.patch @@ -0,0 +1,64 @@ +From foo@baz Wed Jun 26 16:19:44 PDT 2013 +Date: Wed, 26 Jun 2013 16:19:44 -0700 +To: Greg KH <gregkh@linuxfoundation.org>, Juergen Stuber <starblue@users.sourceforge.net> +Cc: linux-usb@vger.kernel.org +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: USB: legotower: remove direct calls to printk() + +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 | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/drivers/usb/misc/legousbtower.c ++++ b/drivers/usb/misc/legousbtower.c +@@ -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 *ino + 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 * + /* 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 + /* 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 + 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); + } |