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-legotower-remove-unneeded-tracing-macros.patch | |
| parent | cba9545b635d1566060d5a8f1a9dc78680f4e839 (diff) | |
| download | patches-bbcc0c699929d3b01ecf3066a35799defe733dd2.tar.gz | |
remove a bunch of patches now in Linus's tree
Diffstat (limited to 'applied/usb-legotower-remove-unneeded-tracing-macros.patch')
| -rw-r--r-- | applied/usb-legotower-remove-unneeded-tracing-macros.patch | 217 |
1 files changed, 0 insertions, 217 deletions
diff --git a/applied/usb-legotower-remove-unneeded-tracing-macros.patch b/applied/usb-legotower-remove-unneeded-tracing-macros.patch deleted file mode 100644 index 2a1566fa382755..00000000000000 --- a/applied/usb-legotower-remove-unneeded-tracing-macros.patch +++ /dev/null @@ -1,217 +0,0 @@ -From foo@baz Wed Jun 26 16:15:10 PDT 2013 -Date: Wed, 26 Jun 2013 16:15:10 -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 unneeded tracing macros - -Remove the unneeded tracing macros in this driver. The kernel has a -built-in trace function that can be used if this is really still needed. - - -Cc: Juergen Stuber <starblue@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/usb/misc/legousbtower.c | 42 ---------------------------------------- - 1 file changed, 1 insertion(+), 41 deletions(-) - ---- a/drivers/usb/misc/legousbtower.c -+++ b/drivers/usb/misc/legousbtower.c -@@ -318,8 +318,6 @@ static inline void lego_usb_tower_debug_ - */ - static inline void tower_delete (struct lego_usb_tower *dev) - { -- dbg(2, "%s: enter", __func__); -- - tower_abort_transfers (dev); - - /* free data structures */ -@@ -329,8 +327,6 @@ static inline void tower_delete (struct - kfree (dev->interrupt_in_buffer); - kfree (dev->interrupt_out_buffer); - kfree (dev); -- -- dbg(2, "%s: leave", __func__); - } - - -@@ -346,8 +342,6 @@ static int tower_open (struct inode *ino - struct tower_reset_reply reset_reply; - int result; - -- dbg(2, "%s: enter", __func__); -- - nonseekable_open(inode, file); - subminor = iminor(inode); - -@@ -435,8 +429,6 @@ unlock_exit: - mutex_unlock(&dev->lock); - - exit: -- dbg(2, "%s: leave, return value %d ", __func__, retval); -- - return retval; - } - -@@ -448,8 +440,6 @@ static int tower_release (struct inode * - struct lego_usb_tower *dev; - int retval = 0; - -- dbg(2, "%s: enter", __func__); -- - dev = file->private_data; - - if (dev == NULL) { -@@ -491,7 +481,6 @@ unlock_exit: - exit: - mutex_unlock(&open_disc_mutex); - exit_nolock: -- dbg(2, "%s: leave, return value %d", __func__, retval); - return retval; - } - -@@ -502,11 +491,9 @@ exit_nolock: - */ - static void tower_abort_transfers (struct lego_usb_tower *dev) - { -- dbg(2, "%s: enter", __func__); -- - if (dev == NULL) { - dbg(1, "%s: dev is null", __func__); -- goto exit; -+ return; - } - - /* shutdown transfer */ -@@ -518,9 +505,6 @@ static void tower_abort_transfers (struc - } - if (dev->interrupt_out_busy && dev->udev) - usb_kill_urb(dev->interrupt_out_urb); -- --exit: -- dbg(2, "%s: leave", __func__); - } - - -@@ -553,8 +537,6 @@ static unsigned int tower_poll (struct f - struct lego_usb_tower *dev; - unsigned int mask = 0; - -- dbg(2, "%s: enter", __func__); -- - dev = file->private_data; - - if (!dev->udev) -@@ -571,8 +553,6 @@ static unsigned int tower_poll (struct f - mask |= POLLOUT | POLLWRNORM; - } - -- dbg(2, "%s: leave, mask = %d", __func__, mask); -- - return mask; - } - -@@ -597,8 +577,6 @@ static ssize_t tower_read (struct file * - int retval = 0; - unsigned long timeout = 0; - -- dbg(2, "%s: enter, count = %Zd", __func__, count); -- - dev = file->private_data; - - /* lock this object */ -@@ -672,7 +650,6 @@ unlock_exit: - mutex_unlock(&dev->lock); - - exit: -- dbg(2, "%s: leave, return value %d", __func__, retval); - return retval; - } - -@@ -686,8 +663,6 @@ static ssize_t tower_write (struct file - size_t bytes_to_write; - int retval = 0; - -- dbg(2, "%s: enter, count = %Zd", __func__, count); -- - dev = file->private_data; - - /* lock this object */ -@@ -757,8 +732,6 @@ unlock_exit: - mutex_unlock(&dev->lock); - - exit: -- dbg(2, "%s: leave, return value %d", __func__, retval); -- - return retval; - } - -@@ -772,8 +745,6 @@ static void tower_interrupt_in_callback - int status = urb->status; - int retval; - -- dbg(4, "%s: enter, status %d", __func__, status); -- - lego_usb_tower_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer); - - if (status) { -@@ -817,7 +788,6 @@ exit: - wake_up_interruptible (&dev->read_wait); - - lego_usb_tower_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer); -- dbg(4, "%s: leave, status %d", __func__, status); - } - - -@@ -829,7 +799,6 @@ static void tower_interrupt_out_callback - struct lego_usb_tower *dev = urb->context; - int status = urb->status; - -- dbg(4, "%s: enter, status %d", __func__, status); - lego_usb_tower_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer); - - /* sync/async unlink faults aren't errors */ -@@ -844,7 +813,6 @@ static void tower_interrupt_out_callback - wake_up_interruptible(&dev->write_wait); - - lego_usb_tower_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer); -- dbg(4, "%s: leave, status %d", __func__, status); - } - - -@@ -866,8 +834,6 @@ static int tower_probe (struct usb_inter - int retval = -ENOMEM; - int result; - -- dbg(2, "%s: enter", __func__); -- - /* allocate memory for our device state and initialize it */ - - dev = kmalloc (sizeof(struct lego_usb_tower), GFP_KERNEL); -@@ -993,8 +959,6 @@ static int tower_probe (struct usb_inter - - - exit: -- dbg(2, "%s: leave, return value 0x%.8lx (dev)", __func__, (long) dev); -- - return retval; - - error: -@@ -1013,8 +977,6 @@ static void tower_disconnect (struct usb - struct lego_usb_tower *dev; - int minor; - -- dbg(2, "%s: enter", __func__); -- - dev = usb_get_intfdata (interface); - mutex_lock(&open_disc_mutex); - usb_set_intfdata (interface, NULL); -@@ -1041,8 +1003,6 @@ static void tower_disconnect (struct usb - - dev_info(&interface->dev, "LEGO USB Tower #%d now disconnected\n", - (minor - LEGO_USB_TOWER_MINOR_BASE)); -- -- dbg(2, "%s: leave", __func__); - } - - module_usb_driver(tower_driver); |
