diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-05 16:47:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-05 16:47:30 -0700 |
| commit | 01bbefb29bd8f474f7fbee571c84e1f6fc86e9ba (patch) | |
| tree | b6bdb0c56a5877c2620cb39e31d321a38b4d1660 | |
| parent | a8127a134c4991d2173ec65d03d153c1782c8762 (diff) | |
| download | patches-01bbefb29bd8f474f7fbee571c84e1f6fc86e9ba.tar.gz | |
updates
7 files changed, 12 insertions, 12 deletions
diff --git a/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch b/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch index 902e4fb2eee2d5..5677c3185c92f4 100644 --- a/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch +++ b/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +++ b/drivers/usb/misc/adutux.c @@ -27,30 +27,11 @@ #include <linux/mutex.h> - #include <asm/uaccess.h> + #include <linux/uaccess.h> -#ifdef CONFIG_USB_DEBUG -static int debug = 5; @@ -31,8 +31,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - -/* Use our own dbg macro */ -#undef dbg --#define dbg(lvl, format, arg...) \ --do { \ +-#define dbg(lvl, format, arg...) \ +-do { \ - if (debug >= lvl) \ - printk(KERN_DEBUG "%s: " format "\n", __FILE__, ##arg); \ -} while (0) @@ -98,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> struct adu_device *dev = urb->context; int status = urb->status; -- adu_debug_data(5,__func__, urb->actual_length, urb->transfer_buffer); +- adu_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer); + adu_debug_data(&dev->udev->dev, __func__, + urb->actual_length, urb->transfer_buffer); diff --git a/usb-adutux-remove-direct-calls-to-printk.patch b/usb-adutux-remove-direct-calls-to-printk.patch index 1160c65223bddf..56463b6254d5cf 100644 --- a/usb-adutux-remove-direct-calls-to-printk.patch +++ b/usb-adutux-remove-direct-calls-to-printk.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/init.h> -@@ -235,8 +237,8 @@ static int adu_open(struct inode *inode, +@@ -236,8 +238,8 @@ static int adu_open(struct inode *inode, interface = usb_find_interface(&adu_driver, subminor); if (!interface) { @@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> retval = -ENODEV; goto exit_no_device; } -@@ -356,8 +358,7 @@ static ssize_t adu_read(struct file *fil +@@ -357,8 +359,7 @@ static ssize_t adu_read(struct file *fil /* verify that the device wasn't unplugged */ if (dev->udev == NULL) { retval = -ENODEV; @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> goto exit; } -@@ -526,8 +527,7 @@ static ssize_t adu_write(struct file *fi +@@ -527,8 +528,7 @@ static ssize_t adu_write(struct file *fi /* verify that the device wasn't unplugged */ if (dev->udev == NULL) { retval = -ENODEV; diff --git a/usb-phy-remove-config_usb_debug-usage.patch b/usb-phy-remove-config_usb_debug-usage.patch index b3cef66fa0123e..e30581cbf501a5 100644 --- a/usb-phy-remove-config_usb_debug-usage.patch +++ b/usb-phy-remove-config_usb_debug-usage.patch @@ -24,5 +24,5 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG - obj-$(CONFIG_USB_PHY) += phy.o + obj-$(CONFIG_OF) += of.o - # transceiver drivers, keep the list sorted diff --git a/usb-remove-unneeded-idr.h-include.patch b/usb-remove-unneeded-idr.h-include.patch index 52888436737f16..4bfa7718e5cac9 100644 --- a/usb-remove-unneeded-idr.h-include.patch +++ b/usb-remove-unneeded-idr.h-include.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c -@@ -54,7 +54,6 @@ +@@ -53,7 +53,6 @@ #include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/module.h> diff --git a/usb-usbatm-remove-config_usb_debug-dependancy.patch b/usb-usbatm-remove-config_usb_debug-dependancy.patch index d1ac1c7b9525f2..3d22ffa838db00 100644 --- a/usb-usbatm-remove-config_usb_debug-dependancy.patch +++ b/usb-usbatm-remove-config_usb_debug-dependancy.patch @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> printk_ratelimited(KERN_DEBUG "%s: %s!\n", __func__, instance ? "disconnected" : "NULL instance"); #endif err = -ENODEV; -@@ -1119,14 +1119,13 @@ int usbatm_usb_probe(struct usb_interfac +@@ -1120,14 +1120,13 @@ int usbatm_usb_probe(struct usb_interfac instance->rx_channel.buf_size = num_packets * maxpacket; instance->rx_channel.packet_size = maxpacket; diff --git a/usb-usbatm-remove-unneeded-trace-printk-calls.patch b/usb-usbatm-remove-unneeded-trace-printk-calls.patch index 77bfec82b3b474..47744072df983c 100644 --- a/usb-usbatm-remove-unneeded-trace-printk-calls.patch +++ b/usb-usbatm-remove-unneeded-trace-printk-calls.patch @@ -138,7 +138,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /* instance init */ instance = kzalloc(sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL); if (!instance) { -@@ -1257,8 +1225,6 @@ void usbatm_usb_disconnect(struct usb_in +@@ -1258,8 +1226,6 @@ void usbatm_usb_disconnect(struct usb_in struct usbatm_vcc_data *vcc_data; int i; diff --git a/usb-usbatm-remove-unused-udsl_assert-macro.patch b/usb-usbatm-remove-unused-udsl_assert-macro.patch index 69467c67fd2f8c..38b083e56f607f 100644 --- a/usb-usbatm-remove-unused-udsl_assert-macro.patch +++ b/usb-usbatm-remove-unused-udsl_assert-macro.patch @@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (!merge_length) merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset; merge_length += actual_length; -@@ -1175,8 +1169,6 @@ int usbatm_usb_probe(struct usb_interfac +@@ -1176,8 +1170,6 @@ int usbatm_usb_probe(struct usb_interfac struct urb *urb; unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0; |