diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:07:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:07:52 -0700 |
| commit | bbcc0c699929d3b01ecf3066a35799defe733dd2 (patch) | |
| tree | 5fd368175f54e652b663ebd33dc78e174a288445 /applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch | |
| parent | cba9545b635d1566060d5a8f1a9dc78680f4e839 (diff) | |
| download | patches-bbcc0c699929d3b01ecf3066a35799defe733dd2.tar.gz | |
remove a bunch of patches now in Linus's tree
Diffstat (limited to 'applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch')
| -rw-r--r-- | applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch | 125 |
1 files changed, 0 insertions, 125 deletions
diff --git a/applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch b/applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch deleted file mode 100644 index 5677c3185c92f4..00000000000000 --- a/applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch +++ /dev/null @@ -1,125 +0,0 @@ -From foo@baz Wed Jun 26 16:22:38 PDT 2013 -Date: Wed, 26 Jun 2013 16:22:38 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -Cc: linux-usb@vger.kernel.org -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: USB: adutux: remove custom debug macro and module parameter - -Now that we don't use the dbg() macro, remove it, and the module -parameter. Also fix up the "dump_data" function to properly use the -dynamic debug core and the correct printk options, and don't call it -twice per function, as the data doesn't change from the beginning and -the end of the call. - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - drivers/usb/misc/adutux.c | 50 ++++++++-------------------------------------- - 1 file changed, 9 insertions(+), 41 deletions(-) - ---- a/drivers/usb/misc/adutux.c -+++ b/drivers/usb/misc/adutux.c -@@ -27,30 +27,11 @@ - #include <linux/mutex.h> - #include <linux/uaccess.h> - --#ifdef CONFIG_USB_DEBUG --static int debug = 5; --#else --static int debug = 1; --#endif -- --/* Use our own dbg macro */ --#undef dbg --#define dbg(lvl, format, arg...) \ --do { \ -- if (debug >= lvl) \ -- printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \ --} while (0) -- -- - /* Version Information */ - #define DRIVER_VERSION "v0.0.13" - #define DRIVER_AUTHOR "John Homppi" - #define DRIVER_DESC "adutux (see www.ontrak.net)" - --/* Module parameters */ --module_param(debug, int, S_IRUGO | S_IWUSR); --MODULE_PARM_DESC(debug, "Debug enabled or not"); -- - /* Define these values to match your device */ - #define ADU_VENDOR_ID 0x0a07 - #define ADU_PRODUCT_ID 0x0064 -@@ -124,19 +105,11 @@ static DEFINE_MUTEX(adutux_mutex); - - static struct usb_driver adu_driver; - --static void adu_debug_data(int level, const char *function, int size, -- const unsigned char *data) -+static inline void adu_debug_data(struct device *dev, const char *function, -+ int size, const unsigned char *data) - { -- int i; -- -- if (debug < level) -- return; -- -- printk(KERN_DEBUG "%s: %s - length = %d, data = ", -- __FILE__, function, size); -- for (i = 0; i < size; ++i) -- printk("%.2x ", data[i]); -- printk("\n"); -+ dev_dbg(dev, "%s - length = %d, data = %*ph\n", -+ function, size, size, data); - } - - /** -@@ -185,8 +158,8 @@ static void adu_interrupt_in_callback(st - struct adu_device *dev = urb->context; - int status = urb->status; - -- adu_debug_data(5, __func__, urb->actual_length, -- urb->transfer_buffer); -+ adu_debug_data(&dev->udev->dev, __func__, -+ urb->actual_length, urb->transfer_buffer); - - spin_lock(&dev->buflock); - -@@ -222,8 +195,6 @@ exit: - spin_unlock(&dev->buflock); - /* always wake up so we recover from errors */ - wake_up_interruptible(&dev->read_wait); -- adu_debug_data(5, __func__, urb->actual_length, -- urb->transfer_buffer); - } - - static void adu_interrupt_out_callback(struct urb *urb) -@@ -231,7 +202,8 @@ static void adu_interrupt_out_callback(s - struct adu_device *dev = urb->context; - int status = urb->status; - -- adu_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer); -+ adu_debug_data(&dev->udev->dev, __func__, -+ urb->actual_length, urb->transfer_buffer); - - if (status != 0) { - if ((status != -ENOENT) && -@@ -240,17 +212,13 @@ static void adu_interrupt_out_callback(s - "%s :nonzero status received: %d\n", __func__, - status); - } -- goto exit; -+ return; - } - - spin_lock(&dev->buflock); - dev->out_urb_finished = 1; - wake_up(&dev->write_wait); - spin_unlock(&dev->buflock); --exit: -- -- adu_debug_data(5, __func__, urb->actual_length, -- urb->transfer_buffer); - } - - static int adu_open(struct inode *inode, struct file *file) |