staging: line6: drop control URB dumping code

The usbmon feature should be used instead of manually dumping control
URBs.  There are a few advantages to using usbmon:

 * Can be turned on/off at runtime
 * Provides full USB-level traffic
 * tcpdump and wireshark support for powerful analysis
 * No driver-specific code is required

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index 571f2ceceed61225eeb743519dd1700518fafb95..fda92d1e92b5bd7eff0b2d392e6fcc148125b553 100644 (file)
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -177,22 +177,6 @@ void line6_write_hexdump(struct usb_line6 *line6, char dir,
 }
 #endif
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-/*
-       Dump URB data to syslog.
-*/
-static void line6_dump_urb(struct urb *urb)
-{
-       struct usb_line6 *line6 = (struct usb_line6 *)urb->context;
-
-       if (urb->status < 0)
-               return;
-
-       line6_write_hexdump(line6, 'R', (unsigned char *)urb->transfer_buffer,
-                           urb->actual_length);
-}
-#endif
-
 /*
        Send raw message in pieces of wMaxPacketSize bytes.
 */
@@ -201,10 +185,6 @@ int line6_send_raw_message(struct usb_line6 *line6, const char *buffer,
 {
        int i, done = 0;
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-       line6_write_hexdump(line6, 'S', buffer, size);
-#endif
-
        for (i = 0; i < size; i += line6->max_packet_size) {
                int partial;
                const char *frag_buf = buffer + i;
@@ -259,10 +239,6 @@ static int line6_send_raw_message_async_part(struct message *msg,
                         (char *)msg->buffer + done, bytes,
                         line6_async_request_sent, msg, line6->interval);
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-       line6_write_hexdump(line6, 'S', (char *)msg->buffer + done, bytes);
-#endif
-
        msg->done += bytes;
        retval = usb_submit_urb(urb, GFP_ATOMIC);
 
@@ -403,10 +379,6 @@ static void line6_data_received(struct urb *urb)
        if (urb->status == -ESHUTDOWN)
                return;
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-       line6_dump_urb(urb);
-#endif
-
        done =
            line6_midibuf_write(mb, urb->transfer_buffer, urb->actual_length);
 
@@ -502,10 +474,6 @@ int line6_send_program(struct usb_line6 *line6, u8 value)
        buffer[0] = LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_HOST;
        buffer[1] = value;
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-       line6_write_hexdump(line6, 'S', buffer, 2);
-#endif
-
        retval = usb_interrupt_msg(line6->usbdev,
                                   usb_sndintpipe(line6->usbdev,
                                                  line6->ep_control_write),
@@ -539,10 +507,6 @@ int line6_transmit_parameter(struct usb_line6 *line6, int param, u8 value)
        buffer[1] = param;
        buffer[2] = value;
 
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-       line6_write_hexdump(line6, 'S', buffer, 3);
-#endif
-
        retval = usb_interrupt_msg(line6->usbdev,
                                   usb_sndintpipe(line6->usbdev,
                                                  line6->ep_control_write),

diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index 50407294fbd415fdd6acf2ce7499c37139031e3a..348d42549b0988857b375bf54a3185e972e620ef 100644 (file)
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -131,9 +131,6 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
                dev_err(line6->ifcdev, "Out of memory\n");
                return -ENOMEM;
        }
-#ifdef CONFIG_LINE6_USB_DUMP_CTRL
-       line6_write_hexdump(line6, 'S', data, length);
-#endif
 
        transfer_buffer = kmemdup(data, length, GFP_ATOMIC);