diff options
Diffstat (limited to 'usb-ldusb-remove-custom-dbg_info-macro.patch')
| -rw-r--r-- | usb-ldusb-remove-custom-dbg_info-macro.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/usb-ldusb-remove-custom-dbg_info-macro.patch b/usb-ldusb-remove-custom-dbg_info-macro.patch new file mode 100644 index 00000000000000..ebb53dde670bad --- /dev/null +++ b/usb-ldusb-remove-custom-dbg_info-macro.patch @@ -0,0 +1,86 @@ +From foo@baz Wed Jun 26 16:13:27 PDT 2013 +Date: Wed, 26 Jun 2013 16:13:27 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +Cc: linux-usb@vger.kernel.org +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: USB: ldusb: remove custom dbg_info() macro + +We want to get rid of CONFIG_USB_DEBUG, so remove the reliance of the +ldusb driver on it. Don't use the custom macro, or a special module +parameter, instead, rely on the in-kernel dynamic debugging +infrastructure, which is much easier to use, and consistant across the +whole kernel. + +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/usb/misc/ldusb.c | 31 ++++++++++--------------------- + 1 file changed, 10 insertions(+), 21 deletions(-) + +--- a/drivers/usb/misc/ldusb.c ++++ b/drivers/usb/misc/ldusb.c +@@ -129,19 +129,6 @@ MODULE_DESCRIPTION("LD USB Driver"); + MODULE_LICENSE("GPL"); + MODULE_SUPPORTED_DEVICE("LD USB Devices"); + +-#ifdef CONFIG_USB_DEBUG +- static int debug = 1; +-#else +- static int debug = 0; +-#endif +- +-/* Use our own dbg macro */ +-#define dbg_info(dev, format, arg...) do { if (debug) dev_info(dev , format , ## arg); } while (0) +- +-/* Module parameters */ +-module_param(debug, int, S_IRUGO | S_IWUSR); +-MODULE_PARM_DESC(debug, "Debug enabled or not"); +- + /* All interrupt in transfers are collected in a ring buffer to + * avoid racing conditions and get better performance of the driver. + */ +@@ -256,8 +243,9 @@ static void ld_usb_interrupt_in_callback + status == -ESHUTDOWN) { + goto exit; + } else { +- dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n", +- __func__, status); ++ dev_dbg(&dev->intf->dev, ++ "%s: nonzero status received: %d\n", __func__, ++ status); + spin_lock(&dev->rbsl); + goto resubmit; /* maybe we can recover */ + } +@@ -272,8 +260,8 @@ static void ld_usb_interrupt_in_callback + *actual_buffer = urb->actual_length; + memcpy(actual_buffer+1, dev->interrupt_in_buffer, urb->actual_length); + dev->ring_head = next_ring_head; +- dbg_info(&dev->intf->dev, "%s: received %d bytes\n", +- __func__, urb->actual_length); ++ dev_dbg(&dev->intf->dev, "%s: received %d bytes\n", ++ __func__, urb->actual_length); + } else { + dev_warn(&dev->intf->dev, + "Ring buffer overflow, %d bytes dropped\n", +@@ -310,9 +298,9 @@ static void ld_usb_interrupt_out_callbac + if (status && !(status == -ENOENT || + status == -ECONNRESET || + status == -ESHUTDOWN)) +- dbg_info(&dev->intf->dev, +- "%s - nonzero write interrupt status received: %d\n", +- __func__, status); ++ dev_dbg(&dev->intf->dev, ++ "%s - nonzero write interrupt status received: %d\n", ++ __func__, status); + + dev->interrupt_out_busy = 0; + wake_up_interruptible(&dev->write_wait); +@@ -585,7 +573,8 @@ static ssize_t ld_usb_write(struct file + bytes_to_write = min(count, write_buffer_size*dev->interrupt_out_endpoint_size); + if (bytes_to_write < count) + dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write); +- dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __func__, count, bytes_to_write); ++ dev_dbg(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", ++ __func__, count, bytes_to_write); + + if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) { + retval = -EFAULT; |