diff options
| -rw-r--r-- | ipaq.patch | 4 | ||||
| -rw-r--r-- | printk.patch | 3416 | ||||
| -rw-r--r-- | series | 3 | ||||
| -rw-r--r-- | usb-remove-config_usb_device_class.patch | 144 | ||||
| -rw-r--r-- | usb-remove-config_usb_devicefs.patch | 1020 | ||||
| -rw-r--r-- | usb-rename-the-usb-misc-class-from-usb-to-usbmisc.patch | 2 | ||||
| -rw-r--r-- | visor.patch | 4 |
7 files changed, 3343 insertions, 1250 deletions
diff --git a/ipaq.patch b/ipaq.patch index c708b4f3175be6..d2470c051e2217 100644 --- a/ipaq.patch +++ b/ipaq.patch @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { USB_DEVICE(0x049F, 0x0003) }, { USB_DEVICE(0x0104, 0x00BE) }, /* Socket USB Sync */ { USB_DEVICE(0x03F0, 0x1016) }, /* HP USB Sync */ -@@ -623,30 +621,7 @@ static int ipaq_startup(struct usb_seria +@@ -619,30 +617,7 @@ static int ipaq_startup(struct usb_seria return usb_reset_configuration(serial->dev); } @@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); -@@ -655,12 +630,6 @@ MODULE_LICENSE("GPL"); +@@ -651,12 +626,6 @@ MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/printk.patch b/printk.patch index 77ee51d54c98c0..b8ed3ec1db13fc 100644 --- a/printk.patch +++ b/printk.patch @@ -1,9 +1,200 @@ --- - drivers/usb/serial/console.c | 4 +- - drivers/usb/serial/pl2303.c | 84 ++++++++++++++++++++++--------------------- - drivers/usb/serial/visor.c | 28 +++++++------- - 3 files changed, 60 insertions(+), 56 deletions(-) + drivers/usb/serial/belkin_sa.c | 10 ---- + drivers/usb/serial/ch341.c | 22 --------- + drivers/usb/serial/console.c | 6 -- + drivers/usb/serial/cp210x.c | 11 ---- + drivers/usb/serial/cyberjack.c | 18 ------- + drivers/usb/serial/cypress_m8.c | 36 -------------- + drivers/usb/serial/digi_acceleport.c | 25 ---------- + drivers/usb/serial/empeg.c | 4 - + drivers/usb/serial/ezusb.c | 2 + drivers/usb/serial/f81232.c | 3 - + drivers/usb/serial/ftdi_sio.c | 35 -------------- + drivers/usb/serial/garmin_gps.c | 19 ------- + drivers/usb/serial/generic.c | 22 --------- + drivers/usb/serial/ipaq.c | 4 - + drivers/usb/serial/ipw.c | 2 + drivers/usb/serial/ir-usb.c | 13 ----- + drivers/usb/serial/iuu_phoenix.c | 38 --------------- + drivers/usb/serial/keyspan.c | 51 -------------------- + drivers/usb/serial/keyspan_pda.c | 8 --- + drivers/usb/serial/kl5kusb105.c | 9 --- + drivers/usb/serial/kobil_sct.c | 7 -- + drivers/usb/serial/mct_u232.c | 17 ------ + drivers/usb/serial/mos7720.c | 34 +++++-------- + drivers/usb/serial/mos7840.c | 59 ------------------------ + drivers/usb/serial/navman.c | 6 -- + drivers/usb/serial/omninet.c | 13 ----- + drivers/usb/serial/opticon.c | 18 ------- + drivers/usb/serial/option.c | 2 + drivers/usb/serial/oti6858.c | 29 ----------- + drivers/usb/serial/pl2303.c | 83 ++++++++++++++-------------------- + drivers/usb/serial/qcserial.c | 3 - + drivers/usb/serial/sierra.c | 36 +------------- + drivers/usb/serial/spcp8x5.c | 2 + drivers/usb/serial/ssu100.c | 19 ------- + drivers/usb/serial/symbolserial.c | 13 ----- + drivers/usb/serial/ti_usb_3410_5052.c | 38 --------------- + drivers/usb/serial/usb_wwan.c | 23 --------- + drivers/usb/serial/visor.c | 26 ++-------- + drivers/usb/serial/whiteheat.c | 30 ------------ + 39 files changed, 68 insertions(+), 728 deletions(-) +--- a/drivers/usb/serial/belkin_sa.c ++++ b/drivers/usb/serial/belkin_sa.c +@@ -159,8 +159,6 @@ static void belkin_sa_release(struct usb + { + int i; + +- dbg("%s", __func__); +- + for (i = 0; i < serial->num_ports; ++i) + kfree(usb_get_serial_port_data(serial->port[i])); + } +@@ -170,8 +168,6 @@ static int belkin_sa_open(struct tty_str + { + int retval; + +- dbg("%s port %d", __func__, port->number); +- + retval = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); + if (retval) { + dev_err(&port->dev, "usb_submit_urb(read int) failed\n"); +@@ -187,8 +183,6 @@ static int belkin_sa_open(struct tty_str + + static void belkin_sa_close(struct usb_serial_port *port) + { +- dbg("%s port %d", __func__, port->number); +- + usb_serial_generic_close(port); + usb_kill_urb(port->interrupt_in_urb); + } +@@ -463,8 +457,6 @@ static int belkin_sa_tiocmget(struct tty + unsigned long control_state; + unsigned long flags; + +- dbg("%s", __func__); +- + spin_lock_irqsave(&priv->lock, flags); + control_state = priv->control_state; + spin_unlock_irqrestore(&priv->lock, flags); +@@ -484,8 +476,6 @@ static int belkin_sa_tiocmset(struct tty + int rts = 0; + int dtr = 0; + +- dbg("%s", __func__); +- + spin_lock_irqsave(&priv->lock, flags); + control_state = priv->control_state; + +--- a/drivers/usb/serial/ch341.c ++++ b/drivers/usb/serial/ch341.c +@@ -125,8 +125,6 @@ static int ch341_set_baudrate(struct usb + unsigned long factor; + short divisor; + +- dbg("ch341_set_baudrate(%d)", priv->baud_rate); +- + if (!priv->baud_rate) + return -EINVAL; + factor = (CH341_BAUDBASE_FACTOR / priv->baud_rate); +@@ -153,7 +151,6 @@ static int ch341_set_baudrate(struct usb + + static int ch341_set_handshake(struct usb_device *dev, u8 control) + { +- dbg("ch341_set_handshake(0x%02x)", control); + return ch341_control_out(dev, 0xa4, ~control, 0); + } + +@@ -164,8 +161,6 @@ static int ch341_get_status(struct usb_d + const unsigned size = 8; + unsigned long flags; + +- dbg("ch341_get_status()"); +- + buffer = kmalloc(size, GFP_KERNEL); + if (!buffer) + return -ENOMEM; +@@ -196,8 +191,6 @@ static int ch341_configure(struct usb_de + int r; + const unsigned size = 8; + +- dbg("ch341_configure()"); +- + buffer = kmalloc(size, GFP_KERNEL); + if (!buffer) + return -ENOMEM; +@@ -254,8 +247,6 @@ static int ch341_attach(struct usb_seria + struct ch341_private *priv; + int r; + +- dbg("ch341_attach()"); +- + /* private data */ + priv = kzalloc(sizeof(struct ch341_private), GFP_KERNEL); + if (!priv) +@@ -290,7 +281,6 @@ static void ch341_dtr_rts(struct usb_ser + struct ch341_private *priv = usb_get_serial_port_data(port); + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); + /* drop DTR and RTS */ + spin_lock_irqsave(&priv->lock, flags); + if (on) +@@ -304,8 +294,6 @@ static void ch341_dtr_rts(struct usb_ser + + static void ch341_close(struct usb_serial_port *port) + { +- dbg("%s - port %d", __func__, port->number); +- + usb_serial_generic_close(port); + usb_kill_urb(port->interrupt_in_urb); + } +@@ -318,8 +306,6 @@ static int ch341_open(struct tty_struct + struct ch341_private *priv = usb_get_serial_port_data(serial->port[0]); + int r; + +- dbg("ch341_open()"); +- + priv->baud_rate = DEFAULT_BAUD_RATE; + + r = ch341_configure(serial->dev, priv); +@@ -358,8 +344,6 @@ static void ch341_set_termios(struct tty + unsigned baud_rate; + unsigned long flags; + +- dbg("ch341_set_termios()"); +- + baud_rate = tty_get_baud_rate(tty); + + priv->baud_rate = baud_rate; +@@ -393,8 +377,6 @@ static void ch341_break_ctl(struct tty_s + uint16_t reg_contents; + uint8_t *break_reg; + +- dbg("%s()", __func__); +- + break_reg = kmalloc(2, GFP_KERNEL); + if (!break_reg) { + dev_err(&port->dev, "%s - kmalloc failed\n", __func__); +@@ -461,8 +443,6 @@ static void ch341_read_int_callback(stru + unsigned int actual_length = urb->actual_length; + int status; + +- dbg("%s (%d)", __func__, port->number); +- + switch (urb->status) { + case 0: + /* success */ +@@ -580,8 +560,6 @@ static int ch341_tiocmget(struct tty_str + u8 status; + unsigned int result; + +- dbg("%s (%d)", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + mcr = priv->line_control; + status = priv->line_status; --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c @@ -68,8 +68,6 @@ static int usb_console_setup(struct cons @@ -15,15 +206,2320 @@ if (options) { baud = simple_strtoul(options, NULL, 10); s = options; -@@ -117,6 +115,8 @@ static int usb_console_setup(struct cons +@@ -82,7 +80,7 @@ static int usb_console_setup(struct cons + if (*s) + doflow = (*s++ == 'r'); + } +- ++ + /* Sane default */ + if (baud == 0) + baud = 9600; +@@ -212,8 +210,6 @@ static void usb_console_write(struct con + if (count == 0) + return; + +- dbg("%s - port %d, %d byte(s)", __func__, port->number, count); +- + if (!port->port.console) { + dbg("%s - port not opened", __func__); + return; +--- a/drivers/usb/serial/cp210x.c ++++ b/drivers/usb/serial/cp210x.c +@@ -422,8 +422,6 @@ static int cp210x_open(struct tty_struct + { + int result; + +- dbg("%s - port %d", __func__, port->number); +- + result = cp210x_set_config_single(port, CP210X_IFC_ENABLE, + UART_ENABLE); + if (result) { +@@ -443,8 +441,6 @@ static int cp210x_open(struct tty_struct + + static void cp210x_close(struct usb_serial_port *port) + { +- dbg("%s - port %d", __func__, port->number); +- + usb_serial_generic_close(port); + + mutex_lock(&port->serial->disc_mutex); +@@ -488,8 +484,6 @@ static void cp210x_get_termios_port(stru + unsigned int baud; + unsigned int bits; + +- dbg("%s - port %d", __func__, port->number); +- + cp210x_get_config(port, CP210X_GET_BAUDRATE, &baud, 4); + + dbg("%s - baud rate = %d", __func__, baud); +@@ -787,8 +781,6 @@ static int cp210x_tiocmset_port(struct u + { + unsigned int control = 0; + +- dbg("%s - port %d", __func__, port->number); +- + if (set & TIOCM_RTS) { + control |= CONTROL_RTS; + control |= CONTROL_WRITE_RTS; +@@ -825,8 +817,6 @@ static int cp210x_tiocmget (struct tty_s + unsigned int control; + int result; + +- dbg("%s - port %d", __func__, port->number); +- + cp210x_get_config(port, CP210X_GET_MDMSTS, &control, 1); + + result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0) +@@ -846,7 +836,6 @@ static void cp210x_break_ctl (struct tty + struct usb_serial_port *port = tty->driver_data; + unsigned int state; + +- dbg("%s - port %d", __func__, port->number); + if (break_state == 0) + state = BREAK_OFF; + else +--- a/drivers/usb/serial/cyberjack.c ++++ b/drivers/usb/serial/cyberjack.c +@@ -122,8 +122,6 @@ static int cyberjack_startup(struct usb_ + struct cyberjack_private *priv; + int i; + +- dbg("%s", __func__); +- + /* allocate the private data structure */ + priv = kmalloc(sizeof(struct cyberjack_private), GFP_KERNEL); + if (!priv) +@@ -155,8 +153,6 @@ static void cyberjack_disconnect(struct + { + int i; + +- dbg("%s", __func__); +- + for (i = 0; i < serial->num_ports; ++i) + usb_kill_urb(serial->port[i]->interrupt_in_urb); + } +@@ -165,8 +161,6 @@ static void cyberjack_release(struct usb + { + int i; + +- dbg("%s", __func__); +- + for (i = 0; i < serial->num_ports; ++i) { + /* My special items, the standard routines free my urbs */ + kfree(usb_get_serial_port_data(serial->port[i])); +@@ -180,8 +174,6 @@ static int cyberjack_open(struct tty_st + unsigned long flags; + int result = 0; + +- dbg("%s - port %d", __func__, port->number); +- + dbg("%s - usb_clear_halt", __func__); + usb_clear_halt(port->serial->dev, port->write_urb->pipe); + +@@ -197,8 +189,6 @@ static int cyberjack_open(struct tty_st + + static void cyberjack_close(struct usb_serial_port *port) + { +- dbg("%s - port %d", __func__, port->number); +- + if (port->serial->dev) { + /* shutdown any bulk reads that might be going on */ + usb_kill_urb(port->write_urb); +@@ -214,8 +204,6 @@ static int cyberjack_write(struct tty_st + int result; + int wrexpected; + +- dbg("%s - port %d", __func__, port->number); +- + if (count == 0) { + dbg("%s - write request of 0 bytes", __func__); + return 0; +@@ -307,8 +295,6 @@ static void cyberjack_read_int_callback( + int status = urb->status; + int result; + +- dbg("%s - port %d", __func__, port->number); +- + /* the urb might have been killed. */ + if (status) + return; +@@ -367,8 +353,6 @@ static void cyberjack_read_bulk_callback + int result; + int status = urb->status; + +- dbg("%s - port %d", __func__, port->number); +- + usb_serial_debug_data(debug, &port->dev, __func__, + urb->actual_length, data); + if (status) { +@@ -417,8 +401,6 @@ static void cyberjack_write_bulk_callbac + struct cyberjack_private *priv = usb_get_serial_port_data(port); + int status = urb->status; + +- dbg("%s - port %d", __func__, port->number); +- + set_bit(0, &port->write_urbs_free); + if (status) { + dbg("%s - nonzero write bulk status received: %d", +--- a/drivers/usb/serial/cypress_m8.c ++++ b/drivers/usb/serial/cypress_m8.c +@@ -305,8 +305,6 @@ static int cypress_serial_control(struct + const unsigned int feature_len = 5; + unsigned long flags; + +- dbg("%s", __func__); +- + priv = usb_get_serial_port_data(port); + + if (!priv->comm_is_ok) +@@ -451,8 +449,6 @@ static int generic_startup(struct usb_se + struct cypress_private *priv; + struct usb_serial_port *port = serial->port[0]; + +- dbg("%s - port %d", __func__, port->number); +- + priv = kzalloc(sizeof(struct cypress_private), GFP_KERNEL); + if (!priv) + return -ENOMEM; +@@ -505,8 +501,6 @@ static int cypress_earthmate_startup(str + struct cypress_private *priv; + struct usb_serial_port *port = serial->port[0]; + +- dbg("%s", __func__); +- + if (generic_startup(serial)) { + dbg("%s - Failed setting up port %d", __func__, + port->number); +@@ -537,8 +531,6 @@ static int cypress_hidcom_startup(struct + { + struct cypress_private *priv; + +- dbg("%s", __func__); +- + if (generic_startup(serial)) { + dbg("%s - Failed setting up port %d", __func__, + serial->port[0]->number); +@@ -556,8 +548,6 @@ static int cypress_ca42v2_startup(struct + { + struct cypress_private *priv; + +- dbg("%s", __func__); +- + if (generic_startup(serial)) { + dbg("%s - Failed setting up port %d", __func__, + serial->port[0]->number); +@@ -575,10 +565,7 @@ static void cypress_release(struct usb_s + { + struct cypress_private *priv; + +- dbg("%s - port %d", __func__, serial->port[0]->number); +- + /* all open ports are closed at this point */ +- + priv = usb_get_serial_port_data(serial->port[0]); + + if (priv) { +@@ -595,8 +582,6 @@ static int cypress_open(struct tty_struc + unsigned long flags; + int result = 0; + +- dbg("%s - port %d", __func__, port->number); +- + if (!priv->comm_is_ok) + return -EIO; + +@@ -661,8 +646,6 @@ static void cypress_close(struct usb_ser + struct cypress_private *priv = usb_get_serial_port_data(port); + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + /* writing is potentially harmful, lock must be taken */ + mutex_lock(&port->serial->disc_mutex); + if (port->serial->disconnected) { +@@ -720,7 +703,6 @@ static void cypress_send(struct usb_seri + if (!priv->comm_is_ok) + return; + +- dbg("%s - port %d", __func__, port->number); + dbg("%s - interrupt out size is %d", __func__, + port->interrupt_out_size); + +@@ -828,8 +810,6 @@ static int cypress_write_room(struct tty + int room = 0; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + room = kfifo_avail(&priv->write_fifo); + spin_unlock_irqrestore(&priv->lock, flags); +@@ -847,8 +827,6 @@ static int cypress_tiocmget(struct tty_s + unsigned int result = 0; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + control = priv->line_control; + status = priv->current_status; +@@ -874,8 +852,6 @@ static int cypress_tiocmset(struct tty_s + struct cypress_private *priv = usb_get_serial_port_data(port); + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + if (set & TIOCM_RTS) + priv->line_control |= CONTROL_RTS; +@@ -948,8 +924,6 @@ static void cypress_set_termios(struct t + __u8 oldlines; + int linechange = 0; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + /* We can't clean this one up as we don't know the device type + early enough */ +@@ -1096,8 +1070,6 @@ static int cypress_chars_in_buffer(struc + int chars = 0; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + chars = kfifo_len(&priv->write_fifo); + spin_unlock_irqrestore(&priv->lock, flags); +@@ -1112,8 +1084,6 @@ static void cypress_throttle(struct tty_ + struct usb_serial_port *port = tty->driver_data; + struct cypress_private *priv = usb_get_serial_port_data(port); + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irq(&priv->lock); + priv->rx_flags = THROTTLED; + spin_unlock_irq(&priv->lock); +@@ -1126,8 +1096,6 @@ static void cypress_unthrottle(struct tt + struct cypress_private *priv = usb_get_serial_port_data(port); + int actually_throttled, result; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irq(&priv->lock); + actually_throttled = priv->rx_flags & ACTUALLY_THROTTLED; + priv->rx_flags = 0; +@@ -1161,8 +1129,6 @@ static void cypress_read_int_callback(st + int i = 0; + int status = urb->status; + +- dbg("%s - port %d", __func__, port->number); +- + switch (status) { + case 0: /* success */ + break; +@@ -1303,8 +1269,6 @@ static void cypress_write_int_callback(s + int result; + int status = urb->status; + +- dbg("%s - port %d", __func__, port->number); +- + switch (status) { + case 0: + /* success */ +--- a/drivers/usb/serial/digi_acceleport.c ++++ b/drivers/usb/serial/digi_acceleport.c +@@ -657,9 +657,6 @@ static void digi_rx_throttle(struct tty_ + struct usb_serial_port *port = tty->driver_data; + struct digi_port *priv = usb_get_serial_port_data(port); + +- +- dbg("digi_rx_throttle: TOP: port=%d", priv->dp_port_num); +- + /* stop receiving characters by not resubmitting the read urb */ + spin_lock_irqsave(&priv->dp_port_lock, flags); + priv->dp_throttled = 1; +@@ -675,8 +672,6 @@ static void digi_rx_unthrottle(struct tt + struct usb_serial_port *port = tty->driver_data; + struct digi_port *priv = usb_get_serial_port_data(port); + +- dbg("digi_rx_unthrottle: TOP: port=%d", priv->dp_port_num); +- + spin_lock_irqsave(&priv->dp_port_lock, flags); + + /* restart read chain */ +@@ -904,8 +899,6 @@ static int digi_tiocmget(struct tty_stru + unsigned int val; + unsigned long flags; + +- dbg("%s: TOP: port=%d", __func__, priv->dp_port_num); +- + spin_lock_irqsave(&priv->dp_port_lock, flags); + val = priv->dp_modem_signals; + spin_unlock_irqrestore(&priv->dp_port_lock, flags); +@@ -921,8 +914,6 @@ static int digi_tiocmset(struct tty_stru + unsigned int val; + unsigned long flags; + +- dbg("%s: TOP: port=%d", __func__, priv->dp_port_num); +- + spin_lock_irqsave(&priv->dp_port_lock, flags); + val = (priv->dp_modem_signals & ~clear) | set; + spin_unlock_irqrestore(&priv->dp_port_lock, flags); +@@ -1013,8 +1004,6 @@ static void digi_write_bulk_callback(str + int ret = 0; + int status = urb->status; + +- dbg("digi_write_bulk_callback: TOP, status=%d", status); +- + /* port and serial sanity check */ + if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) { + pr_err("%s: port or port->private is NULL, status=%d\n", +@@ -1121,8 +1110,6 @@ static int digi_open(struct tty_struct * + struct digi_port *priv = usb_get_serial_port_data(port); + struct ktermios not_termios; + +- dbg("digi_open: TOP: port=%d", priv->dp_port_num); +- + /* be sure the device is started up */ + if (digi_startup_device(port->serial) != 0) + return -ENXIO; +@@ -1160,8 +1147,6 @@ static void digi_close(struct usb_serial + unsigned char buf[32]; + struct digi_port *priv = usb_get_serial_port_data(port); + +- dbg("digi_close: TOP: port=%d", priv->dp_port_num); +- + mutex_lock(&port->serial->disc_mutex); + /* if disconnected, just clear flags */ + if (port->serial->disconnected) +@@ -1220,7 +1205,6 @@ exit: + wake_up_interruptible(&priv->dp_close_wait); + spin_unlock_irq(&priv->dp_port_lock); + mutex_unlock(&port->serial->disc_mutex); +- dbg("digi_close: done"); + } + + +@@ -1269,8 +1253,6 @@ static int digi_startup(struct usb_seria + struct digi_port *priv; + struct digi_serial *serial_priv; + +- dbg("digi_startup: TOP"); +- + /* allocate the private data structures for all ports */ + /* number of regular ports + 1 for the out-of-band port */ + for (i = 0; i < serial->type->num_ports + 1; i++) { +@@ -1325,7 +1307,6 @@ static int digi_startup(struct usb_seria + static void digi_disconnect(struct usb_serial *serial) + { + int i; +- dbg("digi_disconnect: TOP, in_interrupt()=%ld", in_interrupt()); + + /* stop reads and writes on all ports */ + for (i = 0; i < serial->type->num_ports + 1; i++) { +@@ -1338,7 +1319,6 @@ static void digi_disconnect(struct usb_s + static void digi_release(struct usb_serial *serial) + { + int i; +- dbg("digi_release: TOP, in_interrupt()=%ld", in_interrupt()); + + /* free the private data structures for all ports */ + /* number of regular ports + 1 for the out-of-band port */ +@@ -1356,8 +1336,6 @@ static void digi_read_bulk_callback(stru + int ret; + int status = urb->status; + +- dbg("digi_read_bulk_callback: TOP"); +- + /* port sanity check, do not resubmit if port is not valid */ + if (port == NULL) + return; +@@ -1507,9 +1485,6 @@ static int digi_read_oob_callback(struct + int i; + unsigned int rts; + +- dbg("digi_read_oob_callback: port=%d, len=%d", +- priv->dp_port_num, urb->actual_length); +- + /* handle each oob command */ + for (i = 0; i < urb->actual_length - 3;) { + opcode = ((unsigned char *)urb->transfer_buffer)[i++]; +--- a/drivers/usb/serial/empeg.c ++++ b/drivers/usb/serial/empeg.c +@@ -80,14 +80,12 @@ static int empeg_startup(struct usb_seri + { + int r; + +- dbg("%s", __func__); +- + if (serial->dev->actconfig->desc.bConfigurationValue != 1) { + dev_err(&serial->dev->dev, "active config #%d != 1 ??\n", + serial->dev->actconfig->desc.bConfigurationValue); return -ENODEV; } +- dbg("%s - reset config", __func__); ++ + r = usb_reset_configuration(serial->dev); + + /* continue on with initialization */ +--- a/drivers/usb/serial/ezusb.c ++++ b/drivers/usb/serial/ezusb.c +@@ -26,7 +26,6 @@ int ezusb_writememory(struct usb_serial + int result; + unsigned char *transfer_buffer; -+ dev_dbg(&serial->dev->dev, "%s\n", __func__); +- /* dbg("ezusb_writememory %x, %d", address, length); */ + if (!serial->dev) { + printk(KERN_ERR "ezusb: %s - no physical device present, " + "failing.\n", __func__); +@@ -50,7 +49,6 @@ int ezusb_set_reset(struct usb_serial *s + { + int response; + +- /* dbg("%s - %d", __func__, reset_bit); */ + response = ezusb_writememory(serial, CPUCS_REG, &reset_bit, 1, 0xa0); + if (response < 0) + dev_err(&serial->dev->dev, "%s- %d failed\n", +--- a/drivers/usb/serial/f81232.c ++++ b/drivers/usb/serial/f81232.c +@@ -68,8 +68,6 @@ static void f81232_read_int_callback(str + int status = urb->status; + int retval; + +- dbg("%s (%d)", __func__, port->number); +- + switch (status) { + case 0: + /* success */ +@@ -203,7 +201,6 @@ static int f81232_open(struct tty_struct + if (tty) + f81232_set_termios(tty, port, &tmp_termios); + +- dbg("%s - submitting interrupt urb", __func__); + result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); + if (result) { + dev_err(&port->dev, "%s - failed submitting interrupt urb," +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -1285,8 +1285,6 @@ static int read_latency_timer(struct usb + unsigned char *buf; + int rv; + +- dbg("%s", __func__); +- + buf = kmalloc(1, GFP_KERNEL); + if (!buf) + return -ENOMEM; +@@ -1593,8 +1591,6 @@ static int create_sysfs_attrs(struct usb + struct ftdi_private *priv = usb_get_serial_port_data(port); + int retval = 0; + +- dbg("%s", __func__); +- + /* XXX I've no idea if the original SIO supports the event_char + * sysfs parameter, so I'm playing it safe. */ + if (priv->chip_type != SIO) { +@@ -1619,8 +1615,6 @@ static void remove_sysfs_attrs(struct us + { + struct ftdi_private *priv = usb_get_serial_port_data(port); + +- dbg("%s", __func__); +- + /* XXX see create_sysfs_attrs */ + if (priv->chip_type != SIO) { + device_remove_file(&port->dev, &dev_attr_event_char); +@@ -1667,8 +1661,6 @@ static int ftdi_sio_port_probe(struct us + struct ftdi_sio_quirk *quirk = usb_get_serial_data(port->serial); + + +- dbg("%s", __func__); +- + priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL); + if (!priv) { + dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__, +@@ -1704,8 +1696,6 @@ static int ftdi_sio_port_probe(struct us + /* Called from usbserial:serial_probe */ + static void ftdi_USB_UIRT_setup(struct ftdi_private *priv) + { +- dbg("%s", __func__); +- + priv->flags |= ASYNC_SPD_CUST; + priv->custom_divisor = 77; + priv->force_baud = 38400; +@@ -1716,8 +1706,6 @@ static void ftdi_USB_UIRT_setup(struct f + + static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv) + { +- dbg("%s", __func__); +- + priv->flags |= ASYNC_SPD_CUST; + priv->custom_divisor = 240; + priv->force_baud = 38400; +@@ -1767,8 +1755,6 @@ static int ftdi_jtag_probe(struct usb_se + struct usb_device *udev = serial->dev; + struct usb_interface *interface = serial->interface; + +- dbg("%s", __func__); +- + if (interface == udev->actconfig->interface[0]) { + dev_info(&udev->dev, + "Ignoring serial port reserved for JTAG\n"); +@@ -1782,8 +1768,6 @@ static int ftdi_8u2232c_probe(struct usb + { + struct usb_device *udev = serial->dev; + +- dbg("%s", __func__); +- + if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) || + (udev->product && !strcmp(udev->product, "BeagleBone/XDS100"))) + return ftdi_jtag_probe(serial); +@@ -1800,8 +1784,6 @@ static int ftdi_stmclite_probe(struct us + struct usb_device *udev = serial->dev; + struct usb_interface *interface = serial->interface; + +- dbg("%s", __func__); +- + if (interface == udev->actconfig->interface[2]) + return 0; + +@@ -1839,8 +1821,6 @@ static int ftdi_sio_port_remove(struct u + { + struct ftdi_private *priv = usb_get_serial_port_data(port); + +- dbg("%s", __func__); +- + priv->dev_gone = true; + wake_up_interruptible_all(&priv->delta_msr_wait); + +@@ -1858,8 +1838,6 @@ static int ftdi_open(struct tty_struct * + struct ftdi_private *priv = usb_get_serial_port_data(port); + int result; + +- dbg("%s", __func__); +- + /* No error checking for this (will get errors later anyway) */ + /* See ftdi_sio.h for description of what is reset */ + usb_control_msg(dev, usb_sndctrlpipe(dev, 0), +@@ -1918,8 +1896,6 @@ static void ftdi_close(struct usb_serial + { + struct ftdi_private *priv = usb_get_serial_port_data(port); + +- dbg("%s", __func__); +- + usb_serial_generic_close(port); + kref_put(&priv->kref, ftdi_sio_priv_release); + } +@@ -1976,8 +1952,6 @@ static int ftdi_process_packet(struct tt + char flag; + char *ch; + +- dbg("%s - port %d", __func__, port->number); +- + if (len < 2) { + dbg("malformed packet"); + return 0; +@@ -2121,8 +2095,6 @@ static void ftdi_set_termios(struct tty_ + unsigned char vstop; + unsigned char vstart; + +- dbg("%s", __func__); +- + /* Force baud rate if this device requires it, unless it is set to + B0. */ + if (priv->force_baud && ((termios->c_cflag & CBAUD) != B0)) { +@@ -2295,8 +2267,6 @@ static int ftdi_tiocmget(struct tty_stru + int len; + int ret; + +- dbg("%s TIOCMGET", __func__); +- + buf = kmalloc(2, GFP_KERNEL); + if (!buf) + return -ENOMEM; +@@ -2346,7 +2316,7 @@ static int ftdi_tiocmset(struct tty_stru + unsigned int set, unsigned int clear) + { + struct usb_serial_port *port = tty->driver_data; +- dbg("%s TIOCMSET", __func__); + - retval = usb_autopm_get_interface(serial->interface); - if (retval) - goto error_get_interface; + return update_mctrl(port, set, clear); + } + +@@ -2435,7 +2405,6 @@ static int __init ftdi_init(void) + { + int retval; + +- dbg("%s", __func__); + if (vendor > 0 && product > 0) { + /* Add user specified VID/PID to reserved element of table. */ + int i; +@@ -2454,8 +2423,6 @@ static int __init ftdi_init(void) + + static void __exit ftdi_exit(void) + { +- dbg("%s", __func__); +- + usb_serial_deregister_drivers(&ftdi_driver, serial_drivers); + } + +--- a/drivers/usb/serial/garmin_gps.c ++++ b/drivers/usb/serial/garmin_gps.c +@@ -345,8 +345,6 @@ static void pkt_clear(struct garmin_data + unsigned long flags; + struct garmin_packet *result = NULL; + +- dbg("%s", __func__); +- + spin_lock_irqsave(&garmin_data_p->lock, flags); + while (!list_empty(&garmin_data_p->pktlist)) { + result = (struct garmin_packet *)garmin_data_p->pktlist.next; +@@ -939,8 +937,6 @@ static int garmin_open(struct tty_struct + int status = 0; + struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&garmin_data_p->lock, flags); + garmin_data_p->mode = initial_mode; + garmin_data_p->count = 0; +@@ -996,8 +992,6 @@ static void garmin_write_bulk_callback(s + struct garmin_data *garmin_data_p = + usb_get_serial_port_data(port); + +- dbg("%s - port %d", __func__, port->number); +- + if (GARMIN_LAYERID_APPL == getLayerId(urb->transfer_buffer)) { + + if (garmin_data_p->mode == MODE_GARMIN_SERIAL) { +@@ -1027,9 +1021,6 @@ static int garmin_write_bulk(struct usb_ + unsigned char *buffer; + int status; + +- dbg("%s - port %d, state %d", __func__, port->number, +- garmin_data_p->state); +- + spin_lock_irqsave(&garmin_data_p->lock, flags); + garmin_data_p->flags &= ~FLAGS_DROP_DATA; + spin_unlock_irqrestore(&garmin_data_p->lock, flags); +@@ -1224,8 +1215,6 @@ static void garmin_read_bulk_callback(st + int status = urb->status; + int retval; + +- dbg("%s - port %d", __func__, port->number); +- + if (!serial) { + dbg("%s - bad serial pointer, exiting", __func__); + return; +@@ -1384,7 +1373,6 @@ static void garmin_throttle(struct tty_s + struct usb_serial_port *port = tty->driver_data; + struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); + +- dbg("%s - port %d", __func__, port->number); + /* set flag, data received will be put into a queue + for later processing */ + spin_lock_irq(&garmin_data_p->lock); +@@ -1399,7 +1387,6 @@ static void garmin_unthrottle(struct tty + struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); + int status; + +- dbg("%s - port %d", __func__, port->number); + spin_lock_irq(&garmin_data_p->lock); + garmin_data_p->flags &= ~FLAGS_THROTTLED; + spin_unlock_irq(&garmin_data_p->lock); +@@ -1441,8 +1428,6 @@ static int garmin_attach(struct usb_seri + struct usb_serial_port *port = serial->port[0]; + struct garmin_data *garmin_data_p = NULL; + +- dbg("%s", __func__); +- + garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL); + if (garmin_data_p == NULL) { + dev_err(&port->dev, "%s - Out of memory\n", __func__); +@@ -1471,8 +1456,6 @@ static void garmin_disconnect(struct usb + struct usb_serial_port *port = serial->port[0]; + struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); + +- dbg("%s", __func__); +- + usb_kill_urb(port->interrupt_in_urb); + del_timer_sync(&garmin_data_p->timer); + } +@@ -1483,8 +1466,6 @@ static void garmin_release(struct usb_se + struct usb_serial_port *port = serial->port[0]; + struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); + +- dbg("%s", __func__); +- + kfree(garmin_data_p); + } + +--- a/drivers/usb/serial/generic.c ++++ b/drivers/usb/serial/generic.c +@@ -117,8 +117,6 @@ int usb_serial_generic_open(struct tty_s + int result = 0; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + /* clear the throttle flags */ + spin_lock_irqsave(&port->lock, flags); + port->throttled = 0; +@@ -139,8 +137,6 @@ static void generic_cleanup(struct usb_s + unsigned long flags; + int i; + +- dbg("%s - port %d", __func__, port->number); +- + if (serial->dev) { + /* shutdown any bulk transfers that might be going on */ + if (port->bulk_out_size) { +@@ -161,7 +157,6 @@ static void generic_cleanup(struct usb_s + + void usb_serial_generic_close(struct usb_serial_port *port) + { +- dbg("%s - port %d", __func__, port->number); + generic_cleanup(port); + } + EXPORT_SYMBOL_GPL(usb_serial_generic_close); +@@ -249,8 +244,6 @@ int usb_serial_generic_write(struct tty_ + { + int result; + +- dbg("%s - port %d", __func__, port->number); +- + /* only do something if we have a bulk out endpoint */ + if (!port->bulk_out_size) + return -ENODEV; +@@ -273,8 +266,6 @@ int usb_serial_generic_write_room(struct + unsigned long flags; + int room; + +- dbg("%s - port %d", __func__, port->number); +- + if (!port->bulk_out_size) + return 0; + +@@ -292,8 +283,6 @@ int usb_serial_generic_chars_in_buffer(s + unsigned long flags; + int chars; + +- dbg("%s - port %d", __func__, port->number); +- + if (!port->bulk_out_size) + return 0; + +@@ -335,8 +324,6 @@ int usb_serial_generic_submit_read_urbs( + int res; + int i; + +- dbg("%s - port %d", __func__, port->number); +- + for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) { + res = usb_serial_generic_submit_read_urb(port, i, mem_flags); + if (res) +@@ -424,8 +411,6 @@ void usb_serial_generic_write_bulk_callb + int status = urb->status; + int i; + +- dbg("%s - port %d", __func__, port->number); +- + for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i) + if (port->write_urbs[i] == urb) + break; +@@ -454,8 +439,6 @@ void usb_serial_generic_throttle(struct + struct usb_serial_port *port = tty->driver_data; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + /* Set the throttle request flag. It will be picked up + * by usb_serial_generic_read_bulk_callback(). */ + spin_lock_irqsave(&port->lock, flags); +@@ -469,8 +452,6 @@ void usb_serial_generic_unthrottle(struc + struct usb_serial_port *port = tty->driver_data; + int was_throttled; + +- dbg("%s - port %d", __func__, port->number); +- + /* Clear the throttle flags */ + spin_lock_irq(&port->lock); + was_throttled = port->throttled; +@@ -566,8 +547,6 @@ void usb_serial_generic_disconnect(struc + { + int i; + +- dbg("%s", __func__); +- + /* stop reads and writes on all ports */ + for (i = 0; i < serial->num_ports; ++i) + generic_cleanup(serial->port[i]); +@@ -576,5 +555,4 @@ EXPORT_SYMBOL_GPL(usb_serial_generic_dis + + void usb_serial_generic_release(struct usb_serial *serial) + { +- dbg("%s", __func__); + } +--- a/drivers/usb/serial/ipaq.c ++++ b/drivers/usb/serial/ipaq.c +@@ -539,8 +539,6 @@ static int ipaq_open(struct tty_struct * + int result = 0; + int retries = connect_retries; + +- dbg("%s - port %d", __func__, port->number); +- + msleep(1000*initial_wait); + + /* +@@ -596,8 +594,6 @@ static int ipaq_calc_num_ports(struct us + + static int ipaq_startup(struct usb_serial *serial) + { +- dbg("%s", __func__); +- + /* Some of the devices in ipaq_id_table[] are composite, and we + * shouldn't bind to all the interfaces. This test will rule out + * some obviously invalid possibilities. +--- a/drivers/usb/serial/ipw.c ++++ b/drivers/usb/serial/ipw.c +@@ -155,8 +155,6 @@ static int ipw_open(struct tty_struct *t + u8 *buf_flow_init; + int result; + +- dbg("%s", __func__); +- + buf_flow_init = kmemdup(buf_flow_static, 16, GFP_KERNEL); + if (!buf_flow_init) + return -ENOMEM; +--- a/drivers/usb/serial/ir-usb.c ++++ b/drivers/usb/serial/ir-usb.c +@@ -264,8 +264,6 @@ static int ir_open(struct tty_struct *tt + { + int i; + +- dbg("%s - port %d", __func__, port->number); +- + for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i) + port->write_urbs[i]->transfer_flags = URB_ZERO_PACKET; + +@@ -322,15 +320,10 @@ static void ir_process_read_urb(struct u + + static void ir_set_termios_callback(struct urb *urb) + { +- struct usb_serial_port *port = urb->context; +- int status = urb->status; +- +- dbg("%s - port %d", __func__, port->number); +- + kfree(urb->transfer_buffer); + +- if (status) +- dbg("%s - non-zero urb status: %d", __func__, status); ++ if (urb->status) ++ dbg("%s - non-zero urb status: %d", __func__, urb->status); + } + + static void ir_set_termios(struct tty_struct *tty, +@@ -342,8 +335,6 @@ static void ir_set_termios(struct tty_st + speed_t baud; + int ir_baud; + +- dbg("%s - port %d", __func__, port->number); +- + baud = tty_get_baud_rate(tty); + + /* +--- a/drivers/usb/serial/iuu_phoenix.c ++++ b/drivers/usb/serial/iuu_phoenix.c +@@ -135,8 +135,6 @@ static void iuu_release(struct usb_seria + if (!port) + return; + +- dbg("%s", __func__); +- + if (priv) { + iuu_free_buf(priv); + dbg("%s - I will free all", __func__); +@@ -198,8 +196,6 @@ static void iuu_rxcmd(struct urb *urb) + int result; + int status = urb->status; + +- dbg("%s - enter", __func__); +- + if (status) { + dbg("%s - status = %d", __func__, status); + /* error stop all */ +@@ -221,7 +217,6 @@ static int iuu_reset(struct usb_serial_p + struct iuu_private *priv = usb_get_serial_port_data(port); + int result; + char *buf_ptr = port->write_urb->transfer_buffer; +- dbg("%s - enter", __func__); + + /* Prepare the reset sequence */ + +@@ -255,8 +250,6 @@ static void iuu_update_status_callback(s + u8 *st; + int status = urb->status; + +- dbg("%s - enter", __func__); +- + if (status) { + dbg("%s - status = %d", __func__, status); + /* error stop all */ +@@ -299,8 +292,6 @@ static int iuu_status(struct usb_serial_ + { + int result; + +- dbg("%s - enter", __func__); +- + memset(port->write_urb->transfer_buffer, IUU_GET_STATE_REGISTER, 1); + usb_fill_bulk_urb(port->write_urb, port->serial->dev, + usb_sndbulkpipe(port->serial->dev, +@@ -318,8 +309,6 @@ static int bulk_immediate(struct usb_ser + struct usb_serial *serial = port->serial; + int actual = 0; + +- dbg("%s - enter", __func__); +- + /* send the data out the bulk port */ + + status = +@@ -341,10 +330,7 @@ static int read_immediate(struct usb_ser + struct usb_serial *serial = port->serial; + int actual = 0; + +- dbg("%s - enter", __func__); +- + /* send the data out the bulk port */ +- + status = + usb_bulk_msg(serial->dev, + usb_rcvbulkpipe(serial->dev, +@@ -367,8 +353,6 @@ static int iuu_led(struct usb_serial_por + if (!buf) + return -ENOMEM; + +- dbg("%s - enter", __func__); +- + buf[0] = IUU_SET_LED; + buf[1] = R & 0xFF; + buf[2] = (R >> 8) & 0xFF; +@@ -460,8 +444,6 @@ static int iuu_clk(struct usb_serial_por + unsigned int P2 = 0; + int frq = (int)dwFrq; + +- dbg("%s - enter", __func__); +- + if (frq == 0) { + priv->buf[Count++] = IUU_UART_WRITE_I2C; + priv->buf[Count++] = FrqGenAdr << 1; +@@ -590,8 +572,6 @@ static int iuu_uart_flush(struct usb_ser + u8 rxcmd = IUU_UART_RX; + struct iuu_private *priv = usb_get_serial_port_data(port); + +- dbg("%s - enter", __func__); +- + if (iuu_led(port, 0xF000, 0, 0, 0xFF) < 0) + return -EIO; + +@@ -630,8 +610,6 @@ static void read_buf_callback(struct urb + struct tty_struct *tty; + int status = urb->status; + +- dbg("%s - status = %d", __func__, status); +- + if (status) { + if (status == -EPROTO) { + /* reschedule needed */ +@@ -659,7 +637,6 @@ static int iuu_bulk_write(struct usb_ser + int i; + int buf_len; + char *buf_ptr = port->write_urb->transfer_buffer; +- dbg("%s - enter", __func__); + + spin_lock_irqsave(&priv->lock, flags); + *buf_ptr++ = IUU_UART_ESC; +@@ -691,7 +668,6 @@ static int iuu_bulk_write(struct usb_ser + static int iuu_read_buf(struct usb_serial_port *port, int len) + { + int result; +- dbg("%s - enter", __func__); + + usb_fill_bulk_urb(port->read_urb, port->serial->dev, + usb_rcvbulkpipe(port->serial->dev, +@@ -713,8 +689,6 @@ static void iuu_uart_read_callback(struc + unsigned char *data = urb->transfer_buffer; + priv->poll++; + +- dbg("%s - enter", __func__); +- + if (status) { + dbg("%s - status = %d", __func__, status); + /* error stop all */ +@@ -771,7 +745,6 @@ static int iuu_uart_write(struct tty_str + { + struct iuu_private *priv = usb_get_serial_port_data(port); + unsigned long flags; +- dbg("%s - enter", __func__); + + if (count > 256) + return -ENOMEM; +@@ -792,8 +765,6 @@ static void read_rxcmd_callback(struct u + int result; + int status = urb->status; + +- dbg("%s - status = %d", __func__, status); +- + if (status) { + /* error stop all */ + return; +@@ -1015,8 +986,6 @@ static void iuu_close(struct usb_serial_ + if (!serial) + return; + +- dbg("%s - port %d", __func__, port->number); +- + iuu_uart_off(port); + if (serial->dev) { + /* free writebuf */ +@@ -1031,7 +1000,6 @@ static void iuu_close(struct usb_serial_ + + static void iuu_init_termios(struct tty_struct *tty) + { +- dbg("%s - enter", __func__); + *(tty->termios) = tty_std_termios; + tty->termios->c_cflag = CLOCAL | CREAD | CS8 | B9600 + | TIOCM_CTS | CSTOPB | PARENB; +@@ -1188,8 +1156,6 @@ static int iuu_vcc_set(struct usb_serial + if (!buf) + return -ENOMEM; + +- dbg("%s - enter", __func__); +- + buf[0] = IUU_SET_VCC; + buf[1] = vcc & 0xFF; + buf[2] = (vcc >> 8) & 0xFF; +@@ -1250,15 +1216,11 @@ static DEVICE_ATTR(vcc_mode, S_IRUSR | S + + static int iuu_create_sysfs_attrs(struct usb_serial_port *port) + { +- dbg("%s", __func__); +- + return device_create_file(&port->dev, &dev_attr_vcc_mode); + } + + static int iuu_remove_sysfs_attrs(struct usb_serial_port *port) + { +- dbg("%s", __func__); +- + device_remove_file(&port->dev, &dev_attr_vcc_mode); + return 0; + } +--- a/drivers/usb/serial/keyspan.c ++++ b/drivers/usb/serial/keyspan.c +@@ -137,8 +137,6 @@ static void keyspan_break_ctl(struct tty + struct usb_serial_port *port = tty->driver_data; + struct keyspan_port_private *p_priv; + +- dbg("%s", __func__); +- + p_priv = usb_get_serial_port_data(port); + + if (break_state == -1) +@@ -158,8 +156,6 @@ static void keyspan_set_termios(struct t + const struct keyspan_device_details *d_details; + unsigned int cflag; + +- dbg("%s", __func__); +- + p_priv = usb_get_serial_port_data(port); + d_details = p_priv->device_details; + cflag = tty->termios->c_cflag; +@@ -306,8 +302,6 @@ static void usa26_indat_callback(struct + unsigned char *data = urb->transfer_buffer; + int status = urb->status; + +- dbg("%s", __func__); +- + endpoint = usb_pipeendpoint(urb->pipe); + + if (status) { +@@ -369,8 +363,6 @@ static void usa2x_outdat_callback(struct + + static void usa26_inack_callback(struct urb *urb) + { +- dbg("%s", __func__); +- + } + + static void usa26_outcont_callback(struct urb *urb) +@@ -452,7 +444,6 @@ exit: ; + + static void usa26_glocont_callback(struct urb *urb) + { +- dbg("%s", __func__); + } + + +@@ -465,8 +456,6 @@ static void usa28_indat_callback(struct + struct keyspan_port_private *p_priv; + int status = urb->status; + +- dbg("%s", __func__); +- + port = urb->context; + p_priv = usb_get_serial_port_data(port); + data = urb->transfer_buffer; +@@ -505,7 +494,6 @@ static void usa28_indat_callback(struct + + static void usa28_inack_callback(struct urb *urb) + { +- dbg("%s", __func__); + } + + static void usa28_outcont_callback(struct urb *urb) +@@ -585,7 +573,6 @@ exit: ; + + static void usa28_glocont_callback(struct urb *urb) + { +- dbg("%s", __func__); + } + + +@@ -596,8 +583,6 @@ static void usa49_glocont_callback(struc + struct keyspan_port_private *p_priv; + int i; + +- dbg("%s", __func__); +- + serial = urb->context; + for (i = 0; i < serial->num_ports; ++i) { + port = serial->port[i]; +@@ -625,8 +610,6 @@ static void usa49_instat_callback(struct + int old_dcd_state; + int status = urb->status; + +- dbg("%s", __func__); +- + serial = urb->context; + + if (status) { +@@ -679,7 +662,6 @@ exit: ; + + static void usa49_inack_callback(struct urb *urb) + { +- dbg("%s", __func__); + } + + static void usa49_indat_callback(struct urb *urb) +@@ -691,8 +673,6 @@ static void usa49_indat_callback(struct + unsigned char *data = urb->transfer_buffer; + int status = urb->status; + +- dbg("%s", __func__); +- + endpoint = usb_pipeendpoint(urb->pipe); + + if (status) { +@@ -742,8 +722,6 @@ static void usa49wg_indat_callback(struc + unsigned char *data = urb->transfer_buffer; + int status = urb->status; + +- dbg("%s", __func__); +- + serial = urb->context; + + if (status) { +@@ -806,7 +784,6 @@ static void usa49wg_indat_callback(struc + /* not used, usa-49 doesn't have per-port control endpoints */ + static void usa49_outcont_callback(struct urb *urb) + { +- dbg("%s", __func__); + } + + static void usa90_indat_callback(struct urb *urb) +@@ -819,8 +796,6 @@ static void usa90_indat_callback(struct + unsigned char *data = urb->transfer_buffer; + int status = urb->status; + +- dbg("%s", __func__); +- + endpoint = usb_pipeendpoint(urb->pipe); + + if (status) { +@@ -957,8 +932,6 @@ static void usa67_instat_callback(struct + int old_dcd_state; + int status = urb->status; + +- dbg("%s", __func__); +- + serial = urb->context; + + if (status) { +@@ -1010,8 +983,6 @@ static void usa67_glocont_callback(struc + struct keyspan_port_private *p_priv; + int i; + +- dbg("%s", __func__); +- + serial = urb->context; + for (i = 0; i < serial->num_ports; ++i) { + port = serial->port[i]; +@@ -1035,7 +1006,6 @@ static int keyspan_write_room(struct tty + int data_len; + struct urb *this_urb; + +- dbg("%s", __func__); + p_priv = usb_get_serial_port_data(port); + d_details = p_priv->device_details; + +@@ -1078,8 +1048,6 @@ static int keyspan_open(struct tty_struc + p_priv = usb_get_serial_port_data(port); + d_details = p_priv->device_details; + +- dbg("%s - port%d.", __func__, port->number); +- + /* Set some sane defaults */ + p_priv->rts_state = 1; + p_priv->dtr_state = 1; +@@ -1165,7 +1133,6 @@ static void keyspan_close(struct usb_ser + struct keyspan_serial_private *s_priv; + struct keyspan_port_private *p_priv; + +- dbg("%s", __func__); + s_priv = usb_get_serial_data(serial); + p_priv = usb_get_serial_port_data(port); + +@@ -1438,8 +1405,6 @@ static void keyspan_setup_urbs(struct us + struct callbacks *cback; + int endp; + +- dbg("%s", __func__); +- + s_priv = usb_get_serial_data(serial); + d_details = s_priv->device_details; + +@@ -1853,8 +1818,6 @@ static int keyspan_usa28_send_setup(stru + struct urb *this_urb; + int device_port, err; + +- dbg("%s", __func__); +- + s_priv = usb_get_serial_data(serial); + p_priv = usb_get_serial_port_data(port); + d_details = s_priv->device_details; +@@ -1980,8 +1943,6 @@ static int keyspan_usa49_send_setup(stru + struct urb *this_urb; + int err, device_port; + +- dbg("%s", __func__); +- + s_priv = usb_get_serial_data(serial); + p_priv = usb_get_serial_port_data(port); + d_details = s_priv->device_details; +@@ -2168,8 +2129,6 @@ static int keyspan_usa90_send_setup(stru + int err; + u8 prescaler; + +- dbg("%s", __func__); +- + s_priv = usb_get_serial_data(serial); + p_priv = usb_get_serial_port_data(port); + d_details = s_priv->device_details; +@@ -2300,8 +2259,6 @@ static int keyspan_usa67_send_setup(stru + struct urb *this_urb; + int err, device_port; + +- dbg("%s", __func__); +- + s_priv = usb_get_serial_data(serial); + p_priv = usb_get_serial_port_data(port); + d_details = s_priv->device_details; +@@ -2442,8 +2399,6 @@ static void keyspan_send_setup(struct us + struct keyspan_serial_private *s_priv; + const struct keyspan_device_details *d_details; + +- dbg("%s", __func__); +- + s_priv = usb_get_serial_data(serial); + d_details = s_priv->device_details; + +@@ -2477,8 +2432,6 @@ static int keyspan_startup(struct usb_se + struct keyspan_port_private *p_priv; + const struct keyspan_device_details *d_details; + +- dbg("%s", __func__); +- + for (i = 0; (d_details = keyspan_devices[i]) != NULL; ++i) + if (d_details->product_id == + le16_to_cpu(serial->dev->descriptor.idProduct)) +@@ -2538,8 +2491,6 @@ static void keyspan_disconnect(struct us + struct keyspan_serial_private *s_priv; + struct keyspan_port_private *p_priv; + +- dbg("%s", __func__); +- + s_priv = usb_get_serial_data(serial); + + /* Stop reading/writing urbs */ +@@ -2579,8 +2530,6 @@ static void keyspan_release(struct usb_s + struct usb_serial_port *port; + struct keyspan_serial_private *s_priv; + +- dbg("%s", __func__); +- + s_priv = usb_get_serial_data(serial); + + /* dbg("Freeing serial->private."); */ +--- a/drivers/usb/serial/keyspan_pda.c ++++ b/drivers/usb/serial/keyspan_pda.c +@@ -131,7 +131,6 @@ static void keyspan_pda_request_unthrott + struct usb_serial *serial = priv->serial; + int result; + +- dbg(" request_unthrottle"); + /* ask the device to tell us when the tx buffer becomes + sufficiently empty */ + result = usb_control_msg(serial->dev, +@@ -226,7 +225,7 @@ static void keyspan_pda_rx_throttle(stru + send an XOFF, although it might make sense to foist that off + upon the device too. */ + struct usb_serial_port *port = tty->driver_data; +- dbg("keyspan_pda_rx_throttle port %d", port->number); ++ + usb_kill_urb(port->interrupt_in_urb); + } + +@@ -235,7 +234,7 @@ static void keyspan_pda_rx_unthrottle(st + { + struct usb_serial_port *port = tty->driver_data; + /* just restart the receive interrupt URB */ +- dbg("keyspan_pda_rx_unthrottle port %d", port->number); ++ + if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL)) + dbg(" usb_submit_urb(read urb) failed"); + } +@@ -466,7 +465,6 @@ static int keyspan_pda_write(struct tty_ + select() or poll() too) until we receive that unthrottle interrupt. + Block if we can't write anything at all, otherwise write as much as + we can. */ +- dbg("keyspan_pda_write(%d)", count); + if (count == 0) { + dbg(" write request of 0 bytes"); + return 0; +@@ -766,8 +764,6 @@ static int keyspan_pda_startup(struct us + + static void keyspan_pda_release(struct usb_serial *serial) + { +- dbg("%s", __func__); +- + kfree(usb_get_serial_port_data(serial->port[0])); + } + +--- a/drivers/usb/serial/kl5kusb105.c ++++ b/drivers/usb/serial/kl5kusb105.c +@@ -282,8 +282,6 @@ static void klsi_105_release(struct usb_ + { + int i; + +- dbg("%s", __func__); +- + for (i = 0; i < serial->num_ports; ++i) + kfree(usb_get_serial_port_data(serial->port[i])); + } +@@ -298,8 +296,6 @@ static int klsi_105_open(struct tty_str + struct klsi_105_port_settings *cfg; + unsigned long flags; + +- dbg("%s port %d", __func__, port->number); +- + /* Do a defined restart: + * Set up sane default baud rate and send the 'READ_ON' + * vendor command. +@@ -376,8 +372,6 @@ static void klsi_105_close(struct usb_se + { + int rc; + +- dbg("%s port %d", __func__, port->number); +- + mutex_lock(&port->serial->disc_mutex); + if (!port->serial->disconnected) { + /* send READ_OFF */ +@@ -646,7 +640,6 @@ static int klsi_105_tiocmget(struct tty_ + unsigned long flags; + int rc; + unsigned long line_state; +- dbg("%s - request, just guessing", __func__); + + rc = klsi_105_get_line_state(port, &line_state); + if (rc < 0) { +@@ -668,8 +661,6 @@ static int klsi_105_tiocmset(struct tty_ + { + int retval = -EINVAL; + +- dbg("%s", __func__); +- + /* if this ever gets implemented, it should be done something like this: + struct usb_serial *serial = port->serial; + struct klsi_105_private *priv = usb_get_serial_port_data(port); +--- a/drivers/usb/serial/kobil_sct.c ++++ b/drivers/usb/serial/kobil_sct.c +@@ -193,7 +193,6 @@ static int kobil_startup(struct usb_seri + static void kobil_release(struct usb_serial *serial) + { + int i; +- dbg("%s - port %d", __func__, serial->port[0]->number); + + for (i = 0; i < serial->num_ports; ++i) + kfree(usb_get_serial_port_data(serial->port[i])); +@@ -217,7 +216,6 @@ static int kobil_open(struct tty_struct + int transfer_buffer_length = 8; + int write_urb_transfer_buffer_length = 8; + +- dbg("%s - port %d", __func__, port->number); + priv = usb_get_serial_port_data(port); + + /* allocate memory for transfer buffer */ +@@ -327,8 +325,6 @@ static int kobil_open(struct tty_struct + + static void kobil_close(struct usb_serial_port *port) + { +- dbg("%s - port %d", __func__, port->number); +- + /* FIXME: Add rts/dtr methods */ + if (port->write_urb) { + usb_poison_urb(port->write_urb); +@@ -349,8 +345,6 @@ static void kobil_read_int_callback(stru + int status = urb->status; + /* char *dbg_data; */ + +- dbg("%s - port %d", __func__, port->number); +- + if (status) { + dbg("%s - port %d Read int status not zero: %d", + __func__, port->number, status); +@@ -474,7 +468,6 @@ static int kobil_write(struct tty_struct + + static int kobil_write_room(struct tty_struct *tty) + { +- /* dbg("%s - port %d", __func__, port->number); */ + /* FIXME */ + return 8; + } +--- a/drivers/usb/serial/mct_u232.c ++++ b/drivers/usb/serial/mct_u232.c +@@ -427,8 +427,6 @@ static void mct_u232_release(struct usb_ + struct mct_u232_private *priv; + int i; + +- dbg("%s", __func__); +- + for (i = 0; i < serial->num_ports; ++i) { + /* My special items, the standard routines free my urbs */ + priv = usb_get_serial_port_data(serial->port[i]); +@@ -446,8 +444,6 @@ static int mct_u232_open(struct tty_str + unsigned char last_lcr; + unsigned char last_msr; + +- dbg("%s port %d", __func__, port->number); +- + /* Compensate for a hardware bug: although the Sitecom U232-P25 + * device reports a maximum output packet size of 32 bytes, + * it seems to be able to accept only 16 bytes (and that's what +@@ -528,8 +524,6 @@ static void mct_u232_dtr_rts(struct usb_ + + static void mct_u232_close(struct usb_serial_port *port) + { +- dbg("%s port %d", __func__, port->number); +- + if (port->serial->dev) { + /* shutdown our urbs */ + usb_kill_urb(port->write_urb); +@@ -572,7 +566,6 @@ static void mct_u232_read_int_callback(s + return; + } + +- dbg("%s - port %d", __func__, port->number); + usb_serial_debug_data(debug, &port->dev, __func__, + urb->actual_length, data); + +@@ -733,8 +726,6 @@ static void mct_u232_break_ctl(struct tt + unsigned char lcr; + unsigned long flags; + +- dbg("%sstate=%d", __func__, break_state); +- + spin_lock_irqsave(&priv->lock, flags); + lcr = priv->last_lcr; + +@@ -753,8 +744,6 @@ static int mct_u232_tiocmget(struct tty_ + unsigned int control_state; + unsigned long flags; + +- dbg("%s", __func__); +- + spin_lock_irqsave(&priv->lock, flags); + control_state = priv->control_state; + spin_unlock_irqrestore(&priv->lock, flags); +@@ -771,8 +760,6 @@ static int mct_u232_tiocmset(struct tty_ + unsigned int control_state; + unsigned long flags; + +- dbg("%s", __func__); +- + spin_lock_irqsave(&priv->lock, flags); + control_state = priv->control_state; + +@@ -796,8 +783,6 @@ static void mct_u232_throttle(struct tty + struct mct_u232_private *priv = usb_get_serial_port_data(port); + unsigned int control_state; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irq(&priv->lock); + priv->rx_flags |= THROTTLED; + if (C_CRTSCTS(tty)) { +@@ -816,8 +801,6 @@ static void mct_u232_unthrottle(struct t + struct mct_u232_private *priv = usb_get_serial_port_data(port); + unsigned int control_state; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irq(&priv->lock); + if ((priv->rx_flags & THROTTLED) && C_CRTSCTS(tty)) { + priv->rx_flags &= ~THROTTLED; +--- a/drivers/usb/serial/mos7720.c ++++ b/drivers/usb/serial/mos7720.c +@@ -257,7 +257,6 @@ static void destroy_mos_parport(struct k + struct mos7715_parport *mos_parport = + container_of(kref, struct mos7715_parport, ref_count); + +- dbg("%s called", __func__); + kfree(mos_parport); + } + +@@ -266,7 +265,7 @@ static void destroy_urbtracker(struct kr + struct urbtracker *urbtrack = + container_of(kref, struct urbtracker, ref_count); + struct mos7715_parport *mos_parport = urbtrack->mos_parport; +- dbg("%s called", __func__); ++ + usb_free_urb(urbtrack->urb); + kfree(urbtrack); + kref_put(&mos_parport->ref_count, destroy_mos_parport); +@@ -285,8 +284,6 @@ static void send_deferred_urbs(unsigned + struct urbtracker *urbtrack; + struct list_head *cursor, *next; + +- dbg("%s called", __func__); +- + /* if release function ran, game over */ + if (unlikely(mos_parport->serial == NULL)) + return; +@@ -335,7 +332,7 @@ static void async_complete(struct urb *u + { + struct urbtracker *urbtrack = urb->context; + int status = urb->status; +- dbg("%s called", __func__); ++ + if (unlikely(status)) + dbg("%s - nonzero urb status received: %d", __func__, status); + +@@ -355,7 +352,6 @@ static int write_parport_reg_nonblock(st + struct usb_ctrlrequest setup; + struct usb_serial *serial = mos_parport->serial; + struct usb_device *usbdev = serial->dev; +- dbg("%s called", __func__); + + /* create and initialize the control urb and containing urbtracker */ + urbtrack = kmalloc(sizeof(struct urbtracker), GFP_ATOMIC); +@@ -476,7 +472,7 @@ static inline void parport_epilogue(stru + static void parport_mos7715_write_data(struct parport *pp, unsigned char d) + { + struct mos7715_parport *mos_parport = pp->private_data; +- dbg("%s called: %2.2x", __func__, d); ++ + if (parport_prologue(pp) < 0) + return; + mos7715_change_mode(mos_parport, SPP); +@@ -488,7 +484,7 @@ static unsigned char parport_mos7715_rea + { + struct mos7715_parport *mos_parport = pp->private_data; + unsigned char d; +- dbg("%s called", __func__); ++ + if (parport_prologue(pp) < 0) + return 0; + read_mos_reg(mos_parport->serial, dummy, DPR, &d); +@@ -500,7 +496,7 @@ static void parport_mos7715_write_contro + { + struct mos7715_parport *mos_parport = pp->private_data; + __u8 data; +- dbg("%s called: %2.2x", __func__, d); ++ + if (parport_prologue(pp) < 0) + return; + data = ((__u8)d & 0x0f) | (mos_parport->shadowDCR & 0xf0); +@@ -513,7 +509,7 @@ static unsigned char parport_mos7715_rea + { + struct mos7715_parport *mos_parport = pp->private_data; + __u8 dcr; +- dbg("%s called", __func__); ++ + spin_lock(&release_lock); + mos_parport = pp->private_data; + if (unlikely(mos_parport == NULL)) { +@@ -531,7 +527,7 @@ static unsigned char parport_mos7715_fro + { + struct mos7715_parport *mos_parport = pp->private_data; + __u8 dcr; +- dbg("%s called", __func__); ++ + mask &= 0x0f; + val &= 0x0f; + if (parport_prologue(pp) < 0) +@@ -547,7 +543,7 @@ static unsigned char parport_mos7715_rea + { + unsigned char status; + struct mos7715_parport *mos_parport = pp->private_data; +- dbg("%s called", __func__); ++ + spin_lock(&release_lock); + mos_parport = pp->private_data; + if (unlikely(mos_parport == NULL)) { /* release called */ +@@ -561,17 +557,16 @@ static unsigned char parport_mos7715_rea + + static void parport_mos7715_enable_irq(struct parport *pp) + { +- dbg("%s called", __func__); + } ++ + static void parport_mos7715_disable_irq(struct parport *pp) + { +- dbg("%s called", __func__); + } + + static void parport_mos7715_data_forward(struct parport *pp) + { + struct mos7715_parport *mos_parport = pp->private_data; +- dbg("%s called", __func__); ++ + if (parport_prologue(pp) < 0) + return; + mos7715_change_mode(mos_parport, PS2); +@@ -583,7 +578,7 @@ static void parport_mos7715_data_forward + static void parport_mos7715_data_reverse(struct parport *pp) + { + struct mos7715_parport *mos_parport = pp->private_data; +- dbg("%s called", __func__); ++ + if (parport_prologue(pp) < 0) + return; + mos7715_change_mode(mos_parport, PS2); +@@ -595,7 +590,6 @@ static void parport_mos7715_data_reverse + static void parport_mos7715_init_state(struct pardevice *dev, + struct parport_state *s) + { +- dbg("%s called", __func__); + s->u.pc.ctr = DCR_INIT_VAL; + s->u.pc.ecr = ECR_INIT_VAL; + } +@@ -605,7 +599,7 @@ static void parport_mos7715_save_state(s + struct parport_state *s) + { + struct mos7715_parport *mos_parport; +- dbg("%s called", __func__); ++ + spin_lock(&release_lock); + mos_parport = pp->private_data; + if (unlikely(mos_parport == NULL)) { /* release called */ +@@ -622,7 +616,7 @@ static void parport_mos7715_restore_stat + struct parport_state *s) + { + struct mos7715_parport *mos_parport; +- dbg("%s called", __func__); ++ + spin_lock(&release_lock); + mos_parport = pp->private_data; + if (unlikely(mos_parport == NULL)) { /* release called */ +@@ -641,7 +635,7 @@ static size_t parport_mos7715_write_comp + int retval; + struct mos7715_parport *mos_parport = pp->private_data; + int actual_len; +- dbg("%s called: %u chars", __func__, (unsigned int)len); ++ + if (parport_prologue(pp) < 0) + return 0; + mos7715_change_mode(mos_parport, PPF); +--- a/drivers/usb/serial/mos7840.c ++++ b/drivers/usb/serial/mos7840.c +@@ -591,8 +591,6 @@ static void mos7840_interrupt_callback(s + __u16 wval, wreg = 0; + int status = urb->status; + +- dbg("%s", " : Entering"); +- + switch (status) { + case 0: + /* success */ +@@ -766,12 +764,8 @@ static void mos7840_bulk_in_callback(str + return; + } + +- dbg("%s", "Entering... "); +- + data = urb->transfer_buffer; + +- dbg("%s", "Entering ..........."); +- + if (urb->actual_length) { + tty = tty_port_tty_get(&mos7840_port->port->port); + if (tty) { +@@ -835,8 +829,6 @@ static void mos7840_bulk_out_data_callba + return; + } + +- dbg("%s", "Entering ........."); +- + tty = tty_port_tty_get(&mos7840_port->port->port); + if (tty && mos7840_port->open) + tty_wakeup(tty); +@@ -878,8 +870,6 @@ static int mos7840_open(struct tty_struc + struct moschip_port *mos7840_port; + struct moschip_port *port0; + +- dbg ("%s enter", __func__); +- + if (mos7840_port_paranoia_check(port, __func__)) { + dbg("%s", "Port Paranoia failed"); + return -ENODEV; +@@ -1151,10 +1141,7 @@ static int mos7840_open(struct tty_struc + dbg("usb_serial serial:%p mos7840_port:%p\n usb_serial_port port:%p", + serial, mos7840_port, port); + +- dbg ("%s leave", __func__); +- + return 0; +- + } + + /***************************************************************************** +@@ -1175,18 +1162,14 @@ static int mos7840_chars_in_buffer(struc + unsigned long flags; + struct moschip_port *mos7840_port; + +- dbg("%s", " mos7840_chars_in_buffer:entering ..........."); +- + if (mos7840_port_paranoia_check(port, __func__)) { + dbg("%s", "Invalid port"); + return 0; + } + + mos7840_port = mos7840_get_port_private(port); +- if (mos7840_port == NULL) { +- dbg("%s", "mos7840_break:leaving ..........."); ++ if (mos7840_port == NULL) + return 0; +- } + + spin_lock_irqsave(&mos7840_port->pool_lock, flags); + for (i = 0; i < NUM_URBS; ++i) +@@ -1211,8 +1194,6 @@ static void mos7840_close(struct usb_ser + int j; + __u16 Data; + +- dbg("%s", "mos7840_close:entering..."); +- + if (mos7840_port_paranoia_check(port, __func__)) { + dbg("%s", "Port Paranoia failed"); + return; +@@ -1287,8 +1268,6 @@ static void mos7840_close(struct usb_ser + mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data); + + mos7840_port->open = 0; +- +- dbg("%s", "Leaving ............"); + } + + /************************************************************************ +@@ -1343,9 +1322,6 @@ static void mos7840_break(struct tty_str + struct usb_serial *serial; + struct moschip_port *mos7840_port; + +- dbg("%s", "Entering ..........."); +- dbg("mos7840_break: Start"); +- + if (mos7840_port_paranoia_check(port, __func__)) { + dbg("%s", "Port Paranoia failed"); + return; +@@ -1395,8 +1371,6 @@ static int mos7840_write_room(struct tty + unsigned long flags; + struct moschip_port *mos7840_port; + +- dbg("%s", " mos7840_write_room:entering ..........."); +- + if (mos7840_port_paranoia_check(port, __func__)) { + dbg("%s", "Invalid port"); + dbg("%s", " mos7840_write_room:leaving ..........."); +@@ -1445,9 +1419,6 @@ static int mos7840_write(struct tty_stru + /* __u16 Data; */ + const unsigned char *current_position = data; + unsigned char *data1; +- dbg("%s", "entering ..........."); +- /* dbg("mos7840_write: mos7840_port->shadowLCR is %x", +- mos7840_port->shadowLCR); */ + + #ifdef NOTMOS7840 + Data = 0x00; +@@ -1602,8 +1573,6 @@ static void mos7840_throttle(struct tty_ + return; + } + +- dbg("%s", "Entering .........."); +- + /* if we are implementing XON/XOFF, send the stop character */ + if (I_IXOFF(tty)) { + unsigned char stop_char = STOP_CHAR(tty); +@@ -1646,8 +1615,6 @@ static void mos7840_unthrottle(struct tt + return; + } + +- dbg("%s", "Entering .........."); +- + /* if we are implementing XON/XOFF, send the start character */ + if (I_IXOFF(tty)) { + unsigned char start_char = START_CHAR(tty); +@@ -1676,8 +1643,6 @@ static int mos7840_tiocmget(struct tty_s + int status; + mos7840_port = mos7840_get_port_private(port); + +- dbg("%s - port %d", __func__, port->number); +- + if (mos7840_port == NULL) + return -ENODEV; + +@@ -1704,8 +1669,6 @@ static int mos7840_tiocmset(struct tty_s + unsigned int mcr; + int status; + +- dbg("%s - port %d", __func__, port->number); +- + mos7840_port = mos7840_get_port_private(port); + + if (mos7840_port == NULL) +@@ -1746,7 +1709,6 @@ static int mos7840_tiocmset(struct tty_s + static int mos7840_calc_baud_rate_divisor(int baudRate, int *divisor, + __u16 *clk_sel_val) + { +- + dbg("%s - %d", __func__, baudRate); + + if (baudRate <= 115200) { +@@ -1839,8 +1801,6 @@ static int mos7840_send_cmd_write_baud_r + return -1; + } + +- dbg("%s", "Entering .........."); +- + number = mos7840_port->port->number - mos7840_port->port->serial->minor; + + dbg("%s - port = %d, baud = %d", __func__, +@@ -1966,8 +1926,6 @@ static void mos7840_change_port_settings + return; + } + +- dbg("%s", "Entering .........."); +- + lData = LCR_BITS_8; + lStop = LCR_STOP_1; + lParity = LCR_PAR_NONE; +@@ -2108,7 +2066,7 @@ static void mos7840_set_termios(struct t + unsigned int cflag; + struct usb_serial *serial; + struct moschip_port *mos7840_port; +- dbg("mos7840_set_termios: START"); ++ + if (mos7840_port_paranoia_check(port, __func__)) { + dbg("%s", "Invalid port"); + return; +@@ -2361,9 +2319,7 @@ static int mos7840_startup(struct usb_se + struct moschip_port *mos7840_port; + struct usb_device *dev; + int i, status; +- + __u16 Data; +- dbg("%s", "mos7840_startup :Entering.........."); + + if (!serial) { + dbg("%s", "Invalid Handler"); +@@ -2372,9 +2328,6 @@ static int mos7840_startup(struct usb_se + + dev = serial->dev; + +- dbg("%s", "Entering..."); +- dbg ("mos7840_startup: serial = %p", serial); +- + /* we set up the pointers to the endpoints in the mos7840_open * + * function, as the structures aren't created yet. */ + +@@ -2602,7 +2555,6 @@ static void mos7840_disconnect(struct us + int i; + unsigned long flags; + struct moschip_port *mos7840_port; +- dbg("%s", " disconnect :entering.........."); + + if (!serial) { + dbg("%s", "Invalid Handler"); +@@ -2624,9 +2576,6 @@ static void mos7840_disconnect(struct us + usb_kill_urb(mos7840_port->control_urb); + } + } +- +- dbg("%s", "Thank u :: "); +- + } + + /**************************************************************************** +@@ -2638,7 +2587,6 @@ static void mos7840_release(struct usb_s + { + int i; + struct moschip_port *mos7840_port; +- dbg("%s", " release :entering.........."); + + if (!serial) { + dbg("%s", "Invalid Handler"); +@@ -2659,9 +2607,6 @@ static void mos7840_release(struct usb_s + kfree(mos7840_port); + } + } +- +- dbg("%s", "Thank u :: "); +- + } + + static struct usb_driver io_driver = { +--- a/drivers/usb/serial/navman.c ++++ b/drivers/usb/serial/navman.c +@@ -84,8 +84,6 @@ static int navman_open(struct tty_struct + { + int result = 0; + +- dbg("%s - port %d", __func__, port->number); +- + if (port->interrupt_in_urb) { + dbg("%s - adding interrupt input for treo", __func__); + result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); +@@ -99,16 +97,12 @@ static int navman_open(struct tty_struct + + static void navman_close(struct usb_serial_port *port) + { +- dbg("%s - port %d", __func__, port->number); +- + usb_kill_urb(port->interrupt_in_urb); + } + + static int navman_write(struct tty_struct *tty, struct usb_serial_port *port, + const unsigned char *buf, int count) + { +- dbg("%s - port %d", __func__, port->number); +- + /* + * This device can't write any data, only read from the device + */ +--- a/drivers/usb/serial/omninet.c ++++ b/drivers/usb/serial/omninet.c +@@ -144,8 +144,6 @@ static int omninet_open(struct tty_struc + struct usb_serial_port *wport; + int result = 0; + +- dbg("%s - port %d", __func__, port->number); +- + wport = serial->port[1]; + tty_port_tty_set(&wport->port, tty); + +@@ -160,7 +158,6 @@ static int omninet_open(struct tty_struc + + static void omninet_close(struct usb_serial_port *port) + { +- dbg("%s - port %d", __func__, port->number); + usb_kill_urb(port->read_urb); + } + +@@ -178,8 +175,6 @@ static void omninet_read_bulk_callback(s + int result; + int i; + +- dbg("%s - port %d", __func__, port->number); +- + if (status) { + dbg("%s - nonzero read bulk status received: %d", + __func__, status); +@@ -225,8 +220,6 @@ static int omninet_write(struct tty_stru + + int result; + +- dbg("%s - port %d", __func__, port->number); +- + if (count == 0) { + dbg("%s - write request of 0 bytes", __func__); + return 0; +@@ -289,8 +282,6 @@ static void omninet_write_bulk_callback( + struct usb_serial_port *port = urb->context; + int status = urb->status; + +- dbg("%s - port %0x", __func__, port->number); +- + set_bit(0, &port->write_urbs_free); + if (status) { + dbg("%s - nonzero write bulk status received: %d", +@@ -306,8 +297,6 @@ static void omninet_disconnect(struct us + { + struct usb_serial_port *wport = serial->port[1]; + +- dbg("%s", __func__); +- + usb_kill_urb(wport->write_urb); + } + +@@ -316,8 +305,6 @@ static void omninet_release(struct usb_s + { + struct usb_serial_port *port = serial->port[0]; + +- dbg("%s", __func__); +- + kfree(usb_get_serial_port_data(port)); + } + +--- a/drivers/usb/serial/opticon.c ++++ b/drivers/usb/serial/opticon.c +@@ -70,8 +70,6 @@ static void opticon_read_bulk_callback(s + int data_length; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + switch (status) { + case 0: + /* success */ +@@ -179,8 +177,6 @@ static int opticon_open(struct tty_struc + unsigned long flags; + int result = 0; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + priv->throttled = false; + priv->actually_throttled = false; +@@ -216,8 +212,6 @@ static void opticon_close(struct usb_ser + { + struct opticon_private *priv = usb_get_serial_data(port->serial); + +- dbg("%s - port %d", __func__, port->number); +- + /* shutdown our urbs */ + usb_kill_urb(priv->bulk_read_urb); + } +@@ -256,8 +250,6 @@ static int opticon_write(struct tty_stru + int status; + struct usb_ctrlrequest *dr; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + if (priv->outstanding_urbs > URB_UPPER_LIMIT) { + spin_unlock_irqrestore(&priv->lock, flags); +@@ -338,8 +330,6 @@ static int opticon_write_room(struct tty + struct opticon_private *priv = usb_get_serial_data(port->serial); + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + /* + * We really can take almost anything the user throws at us + * but let's pick a nice big number to tell the tty +@@ -362,7 +352,6 @@ static void opticon_throttle(struct tty_ + struct opticon_private *priv = usb_get_serial_data(port->serial); + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); + spin_lock_irqsave(&priv->lock, flags); + priv->throttled = true; + spin_unlock_irqrestore(&priv->lock, flags); +@@ -376,8 +365,6 @@ static void opticon_unthrottle(struct tt + unsigned long flags; + int result, was_throttled; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + priv->throttled = false; + was_throttled = priv->actually_throttled; +@@ -400,7 +387,6 @@ static int opticon_tiocmget(struct tty_s + unsigned long flags; + int result = 0; + +- dbg("%s - port %d", __func__, port->number); + if (!usb_get_intfdata(port->serial->interface)) + return -ENODEV; + +@@ -555,8 +541,6 @@ static void opticon_disconnect(struct us + { + struct opticon_private *priv = usb_get_serial_data(serial); + +- dbg("%s", __func__); +- + usb_kill_urb(priv->bulk_read_urb); + usb_free_urb(priv->bulk_read_urb); + } +@@ -565,8 +549,6 @@ static void opticon_release(struct usb_s + { + struct opticon_private *priv = usb_get_serial_data(serial); + +- dbg("%s", __func__); +- + kfree(priv->bulk_in_buffer); + kfree(priv); + } +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1375,7 +1375,6 @@ static void option_instat_callback(struc + struct usb_serial_port *port = urb->context; + struct option_port_private *portdata = usb_get_serial_port_data(port); + +- dbg("%s", __func__); + dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata); + + if (status == 0) { +@@ -1437,7 +1436,6 @@ static int option_send_setup(struct usb_ + struct option_port_private *portdata; + int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber; + int val = 0; +- dbg("%s", __func__); + + if (is_blacklisted(ifNum, OPTION_BLACKLIST_SENDSETUP, + (struct option_blacklist_info *) intfdata->private)) { +--- a/drivers/usb/serial/oti6858.c ++++ b/drivers/usb/serial/oti6858.c +@@ -211,8 +211,6 @@ static void setup_line(struct work_struc + unsigned long flags; + int result; + +- dbg("%s(port = %d)", __func__, port->number); +- + new_setup = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL); + if (new_setup == NULL) { + dev_err(&port->dev, "%s(): out of memory!\n", __func__); +@@ -282,8 +280,6 @@ static void send_data(struct work_struct + unsigned long flags; + u8 *allow; + +- dbg("%s(port = %d)", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + if (priv->flags.write_urb_in_use) { + spin_unlock_irqrestore(&priv->lock, flags); +@@ -379,8 +375,6 @@ static int oti6858_startup(struct usb_se + static int oti6858_write(struct tty_struct *tty, struct usb_serial_port *port, + const unsigned char *buf, int count) + { +- dbg("%s(port = %d, count = %d)", __func__, port->number, count); +- + if (!count) + return count; + +@@ -395,8 +389,6 @@ static int oti6858_write_room(struct tty + int room = 0; + unsigned long flags; + +- dbg("%s(port = %d)", __func__, port->number); +- + spin_lock_irqsave(&port->lock, flags); + room = kfifo_avail(&port->write_fifo); + spin_unlock_irqrestore(&port->lock, flags); +@@ -410,8 +402,6 @@ static int oti6858_chars_in_buffer(struc + int chars = 0; + unsigned long flags; + +- dbg("%s(port = %d)", __func__, port->number); +- + spin_lock_irqsave(&port->lock, flags); + chars = kfifo_len(&port->write_fifo); + spin_unlock_irqrestore(&port->lock, flags); +@@ -437,8 +427,6 @@ static void oti6858_set_termios(struct t + __le16 divisor; + int br; + +- dbg("%s(port = %d)", __func__, port->number); +- + if (!tty) { + dbg("%s(): no tty structures", __func__); + return; +@@ -545,8 +533,6 @@ static int oti6858_open(struct tty_struc + unsigned long flags; + int result; + +- dbg("%s(port = %d)", __func__, port->number); +- + usb_clear_halt(serial->dev, port->write_urb->pipe); + usb_clear_halt(serial->dev, port->read_urb->pipe); + +@@ -602,8 +588,6 @@ static void oti6858_close(struct usb_ser + struct oti6858_private *priv = usb_get_serial_port_data(port); + unsigned long flags; + +- dbg("%s(port = %d)", __func__, port->number); +- + spin_lock_irqsave(&port->lock, flags); + /* clear out any remaining data in the buffer */ + kfifo_reset_out(&port->write_fifo); +@@ -663,8 +647,6 @@ static int oti6858_tiocmget(struct tty_s + unsigned pin_state; + unsigned result = 0; + +- dbg("%s(port = %d)", __func__, port->number); +- + if (!usb_get_intfdata(port->serial->interface)) + return -ENODEV; + +@@ -750,8 +732,6 @@ static void oti6858_release(struct usb_s + { + int i; + +- dbg("%s()", __func__); +- + for (i = 0; i < serial->num_ports; ++i) + kfree(usb_get_serial_port_data(serial->port[i])); + } +@@ -763,9 +743,6 @@ static void oti6858_read_int_callback(st + int transient = 0, can_recv = 0, resubmit = 1; + int status = urb->status; + +- dbg("%s(port = %d, status = %d)", +- __func__, port->number, status); +- + switch (status) { + case 0: + /* success */ +@@ -882,9 +859,6 @@ static void oti6858_read_bulk_callback(s + int status = urb->status; + int result; + +- dbg("%s(port = %d, status = %d)", +- __func__, port->number, status); +- + spin_lock_irqsave(&priv->lock, flags); + priv->flags.read_urb_in_use = 0; + spin_unlock_irqrestore(&priv->lock, flags); +@@ -916,9 +890,6 @@ static void oti6858_write_bulk_callback( + int status = urb->status; + int result; + +- dbg("%s(port = %d, status = %d)", +- __func__, port->number, status); +- + switch (status) { + case 0: + /* success */ --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c @@ -161,8 +161,9 @@ static int pl2303_vendor_read(__u16 valu @@ -69,16 +2565,16 @@ return retval; } -@@ -265,7 +268,7 @@ static void pl2303_set_termios(struct tt +@@ -265,8 +268,6 @@ static void pl2303_set_termios(struct tt int baud_floor, baud_ceil; int k; - dbg("%s - port %d", __func__, port->number); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- /* The PL2303 is reported to lose bytes if you change serial settings even to the same values as before. Thus -@@ -287,7 +290,7 @@ static void pl2303_set_termios(struct tt + we actually need to filter in this specific case */ +@@ -287,7 +288,7 @@ static void pl2303_set_termios(struct tt i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE, 0, 0, buf, 7, 100); @@ -87,7 +2583,7 @@ buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); if (cflag & CSIZE) { -@@ -306,7 +309,7 @@ static void pl2303_set_termios(struct tt +@@ -306,7 +307,7 @@ static void pl2303_set_termios(struct tt buf[6] = 8; break; } @@ -96,7 +2592,7 @@ } /* For reference buf[0]:buf[3] baud rate value */ -@@ -315,7 +318,7 @@ static void pl2303_set_termios(struct tt +@@ -315,7 +316,7 @@ static void pl2303_set_termios(struct tt * 9600 baud (at least my PL2303X always does) */ baud = tty_get_baud_rate(tty); @@ -105,7 +2601,7 @@ if (baud) { /* Set baudrate to nearest supported value */ for (k=0; k<ARRAY_SIZE(baud_sup); k++) { -@@ -341,7 +344,7 @@ static void pl2303_set_termios(struct tt +@@ -341,7 +342,7 @@ static void pl2303_set_termios(struct tt else if (baud > 6000000) baud = 6000000; } @@ -114,7 +2610,7 @@ if (baud <= 115200) { buf[0] = baud & 0xff; buf[1] = (baud >> 8) & 0xff; -@@ -372,14 +375,14 @@ static void pl2303_set_termios(struct tt +@@ -372,14 +373,14 @@ static void pl2303_set_termios(struct tt */ if ((cflag & CSIZE) == CS5) { buf[4] = 1; @@ -132,7 +2628,7 @@ } if (cflag & PARENB) { -@@ -391,29 +394,29 @@ static void pl2303_set_termios(struct tt +@@ -391,29 +392,29 @@ static void pl2303_set_termios(struct tt if (cflag & PARODD) { if (cflag & CMSPAR) { buf[5] = 3; @@ -168,7 +2664,7 @@ /* change control lines if we are switching to or from B0 */ spin_lock_irqsave(&priv->lock, flags); -@@ -435,7 +438,7 @@ static void pl2303_set_termios(struct tt +@@ -435,7 +436,7 @@ static void pl2303_set_termios(struct tt i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE, 0, 0, buf, 7, 100); @@ -177,43 +2673,42 @@ buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); if (cflag & CRTSCTS) { -@@ -473,7 +476,7 @@ static void pl2303_dtr_rts(struct usb_se +@@ -473,8 +474,6 @@ static void pl2303_dtr_rts(struct usb_se static void pl2303_close(struct usb_serial_port *port) { - dbg("%s - port %d", __func__, port->number); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- usb_serial_generic_close(port); usb_kill_urb(port->interrupt_in_urb); -@@ -486,7 +489,7 @@ static int pl2303_open(struct tty_struct + } +@@ -486,8 +485,6 @@ static int pl2303_open(struct tty_struct struct pl2303_private *priv = usb_get_serial_port_data(port); int result; - dbg("%s - port %d", __func__, port->number); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- if (priv->type != HX) { usb_clear_halt(serial->dev, port->write_urb->pipe); -@@ -501,7 +504,7 @@ static int pl2303_open(struct tty_struct + usb_clear_halt(serial->dev, port->read_urb->pipe); +@@ -501,7 +498,6 @@ static int pl2303_open(struct tty_struct if (tty) pl2303_set_termios(tty, port, &tmp_termios); - dbg("%s - submitting interrupt urb", __func__); -+ dev_dbg(&port->dev, "submitting interrupt urb\n"); result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (result) { dev_err(&port->dev, "%s - failed submitting interrupt urb," -@@ -554,7 +557,7 @@ static int pl2303_tiocmget(struct tty_st +@@ -554,8 +550,6 @@ static int pl2303_tiocmget(struct tty_st unsigned int status; unsigned int result; - dbg("%s (%d)", __func__, port->number); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- if (!usb_get_intfdata(port->serial->interface)) return -ENODEV; -@@ -571,7 +574,7 @@ static int pl2303_tiocmget(struct tty_st + +@@ -571,7 +565,7 @@ static int pl2303_tiocmget(struct tty_st | ((status & UART_RING) ? TIOCM_RI : 0) | ((status & UART_DCD) ? TIOCM_CD : 0); @@ -222,7 +2717,7 @@ return result; } -@@ -625,7 +628,8 @@ static int pl2303_ioctl(struct tty_struc +@@ -625,7 +619,8 @@ static int pl2303_ioctl(struct tty_struc { struct serial_struct ser; struct usb_serial_port *port = tty->driver_data; @@ -232,7 +2727,7 @@ switch (cmd) { case TIOCGSERIAL: -@@ -641,10 +645,10 @@ static int pl2303_ioctl(struct tty_struc +@@ -641,10 +636,10 @@ static int pl2303_ioctl(struct tty_struc return 0; case TIOCMIWAIT: @@ -245,13 +2740,12 @@ break; } return -ENOIOCTLCMD; -@@ -657,20 +661,20 @@ static void pl2303_break_ctl(struct tty_ +@@ -657,20 +652,18 @@ static void pl2303_break_ctl(struct tty_ u16 state; int result; - dbg("%s - port %d", __func__, port->number); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- if (break_state == 0) state = BREAK_OFF; else @@ -269,25 +2763,25 @@ } static void pl2303_release(struct usb_serial *serial) -@@ -678,7 +682,7 @@ static void pl2303_release(struct usb_se +@@ -678,8 +671,6 @@ static void pl2303_release(struct usb_se int i; struct pl2303_private *priv; - dbg("%s", __func__); -+ dev_dbg(&serial->dev->dev, "%s\n", __func__); - +- for (i = 0; i < serial->num_ports; ++i) { priv = usb_get_serial_port_data(serial->port[i]); -@@ -742,7 +746,7 @@ static void pl2303_read_int_callback(str + kfree(priv); +@@ -742,8 +733,6 @@ static void pl2303_read_int_callback(str int status = urb->status; int retval; - dbg("%s (%d)", __func__, port->number); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- switch (status) { case 0: -@@ -752,12 +756,12 @@ static void pl2303_read_int_callback(str + /* success */ +@@ -752,12 +741,12 @@ static void pl2303_read_int_callback(str case -ENOENT: case -ESHUTDOWN: /* this urb is terminated, clean up */ @@ -304,7 +2798,7 @@ goto exit; } -@@ -769,7 +773,7 @@ static void pl2303_read_int_callback(str +@@ -769,7 +758,7 @@ static void pl2303_read_int_callback(str exit: retval = usb_submit_urb(urb, GFP_ATOMIC); if (retval) @@ -313,7 +2807,7 @@ "%s - usb_submit_urb failed with result %d\n", __func__, retval); } -@@ -807,7 +811,7 @@ static void pl2303_process_read_urb(stru +@@ -807,7 +796,7 @@ static void pl2303_process_read_urb(stru tty_flag = TTY_PARITY; else if (line_status & UART_FRAME_ERROR) tty_flag = TTY_FRAME; @@ -322,18 +2816,656 @@ /* overrun is special, not associated with a char */ if (line_status & UART_OVERRUN_ERROR) +--- a/drivers/usb/serial/qcserial.c ++++ b/drivers/usb/serial/qcserial.c +@@ -131,7 +131,6 @@ static int qcprobe(struct usb_serial *se + __u8 ifnum; + bool is_gobi1k = id->driver_info ? true : false; + +- dbg("%s", __func__); + dbg("Is Gobi 1000 = %d", is_gobi1k); + + nintf = serial->dev->actconfig->desc.bNumInterfaces; +@@ -250,8 +249,6 @@ static void qc_release(struct usb_serial + { + struct usb_wwan_intf_private *priv = usb_get_serial_data(serial); + +- dbg("%s", __func__); +- + /* Call usb_wwan release & free the private data allocated in qcprobe */ + usb_wwan_release(serial); + usb_set_serial_data(serial, NULL); +--- a/drivers/usb/serial/sierra.c ++++ b/drivers/usb/serial/sierra.c +@@ -63,9 +63,7 @@ struct sierra_intf_private { + + static int sierra_set_power_state(struct usb_device *udev, __u16 swiState) + { +- int result; +- dev_dbg(&udev->dev, "%s\n", __func__); +- result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ++ return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), + SWIMS_USB_REQUEST_SetPower, /* __u8 request */ + USB_TYPE_VENDOR, /* __u8 request type */ + swiState, /* __u16 value */ +@@ -73,14 +71,11 @@ static int sierra_set_power_state(struct + NULL, /* void *data */ + 0, /* __u16 size */ + USB_CTRL_SET_TIMEOUT); /* int timeout */ +- return result; + } + + static int sierra_vsc_set_nmea(struct usb_device *udev, __u16 enable) + { +- int result; +- dev_dbg(&udev->dev, "%s\n", __func__); +- result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), ++ return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), + SWIMS_USB_REQUEST_SetNmea, /* __u8 request */ + USB_TYPE_VENDOR, /* __u8 request type */ + enable, /* __u16 value */ +@@ -88,7 +83,6 @@ static int sierra_vsc_set_nmea(struct us + NULL, /* void *data */ + 0, /* __u16 size */ + USB_CTRL_SET_TIMEOUT); /* int timeout */ +- return result; + } + + static int sierra_calc_num_ports(struct usb_serial *serial) +@@ -96,8 +90,6 @@ static int sierra_calc_num_ports(struct + int num_ports = 0; + u8 ifnum, numendpoints; + +- dev_dbg(&serial->dev->dev, "%s\n", __func__); +- + ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber; + numendpoints = serial->interface->cur_altsetting->desc.bNumEndpoints; + +@@ -150,7 +142,6 @@ static int sierra_calc_interface(struct + int interface; + struct usb_interface *p_interface; + struct usb_host_interface *p_host_interface; +- dev_dbg(&serial->dev->dev, "%s\n", __func__); + + /* Get the interface structure pointer from the serial struct */ + p_interface = serial->interface; +@@ -175,9 +166,8 @@ static int sierra_probe(struct usb_seria + u8 ifnum; + + udev = serial->dev; +- dev_dbg(&udev->dev, "%s\n", __func__); +- + ifnum = sierra_calc_interface(serial); ++ + /* + * If this interface supports more than 1 alternate + * select the 2nd one +@@ -344,8 +334,6 @@ static int sierra_send_setup(struct usb_ + int do_send = 0; + int retval; + +- dev_dbg(&port->dev, "%s\n", __func__); +- + portdata = usb_get_serial_port_data(port); + + if (portdata->dtr_state) +@@ -393,7 +381,6 @@ static int sierra_send_setup(struct usb_ + static void sierra_set_termios(struct tty_struct *tty, + struct usb_serial_port *port, struct ktermios *old_termios) + { +- dev_dbg(&port->dev, "%s\n", __func__); + tty_termios_copy_hw(tty->termios, old_termios); + sierra_send_setup(port); + } +@@ -404,7 +391,6 @@ static int sierra_tiocmget(struct tty_st + unsigned int value; + struct sierra_port_private *portdata; + +- dev_dbg(&port->dev, "%s\n", __func__); + portdata = usb_get_serial_port_data(port); + + value = ((portdata->rts_state) ? TIOCM_RTS : 0) | +@@ -441,8 +427,7 @@ static void sierra_release_urb(struct ur + { + struct usb_serial_port *port; + if (urb) { +- port = urb->context; +- dev_dbg(&port->dev, "%s: %p\n", __func__, urb); ++ port = urb->context; + kfree(urb->transfer_buffer); + usb_free_urb(urb); + } +@@ -455,7 +440,6 @@ static void sierra_outdat_callback(struc + struct sierra_intf_private *intfdata; + int status = urb->status; + +- dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number); + intfdata = port->serial->private; + + /* free up the transfer buffer, as usb_free_urb() does not do this */ +@@ -598,8 +582,6 @@ static void sierra_indat_callback(struct + endpoint = usb_pipeendpoint(urb->pipe); + port = urb->context; + +- dev_dbg(&port->dev, "%s: %p\n", __func__, urb); +- + if (status) { + dev_dbg(&port->dev, "%s: nonzero status: %d on" + " endpoint %02x\n", __func__, status, endpoint); +@@ -697,8 +679,6 @@ static int sierra_write_room(struct tty_ + struct sierra_port_private *portdata = usb_get_serial_port_data(port); + unsigned long flags; + +- dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number); +- + /* try to give a good number back based on if we have any free urbs at + * this point in time */ + spin_lock_irqsave(&portdata->lock, flags); +@@ -805,8 +785,6 @@ static void sierra_close(struct usb_seri + struct sierra_port_private *portdata; + struct sierra_intf_private *intfdata = port->serial->private; + +- +- dev_dbg(&port->dev, "%s\n", __func__); + portdata = usb_get_serial_port_data(port); + + portdata->rts_state = 0; +@@ -851,8 +829,6 @@ static int sierra_open(struct tty_struct + + portdata = usb_get_serial_port_data(port); + +- dev_dbg(&port->dev, "%s\n", __func__); +- + /* Set some sane defaults */ + portdata->rts_state = 1; + portdata->dtr_state = 1; +@@ -915,8 +891,6 @@ static int sierra_startup(struct usb_ser + int i; + u8 ifnum; + +- dev_dbg(&serial->dev->dev, "%s\n", __func__); +- + /* Set Device mode to D0 */ + sierra_set_power_state(serial->dev, 0x0000); + +@@ -977,8 +951,6 @@ static void sierra_release(struct usb_se + struct usb_serial_port *port; + struct sierra_port_private *portdata; + +- dev_dbg(&serial->dev->dev, "%s\n", __func__); +- + for (i = 0; i < serial->num_ports; ++i) { + port = serial->port[i]; + if (!port) +--- a/drivers/usb/serial/spcp8x5.c ++++ b/drivers/usb/serial/spcp8x5.c +@@ -454,8 +454,6 @@ static int spcp8x5_open(struct tty_struc + u8 status = 0x30; + /* status 0x30 means DSR and CTS = 1 other CDC RI and delta = 0 */ + +- dbg("%s - port %d", __func__, port->number); +- + usb_clear_halt(serial->dev, port->write_urb->pipe); + usb_clear_halt(serial->dev, port->read_urb->pipe); + +--- a/drivers/usb/serial/ssu100.c ++++ b/drivers/usb/serial/ssu100.c +@@ -85,7 +85,6 @@ static void ssu100_release(struct usb_se + { + struct ssu100_port_private *priv = usb_get_serial_port_data(*serial->port); + +- dbg("%s", __func__); + kfree(priv); + } + +@@ -171,8 +170,6 @@ static int ssu100_initdevice(struct usb_ + u8 *data; + int result = 0; + +- dbg("%s", __func__); +- + data = kzalloc(3, GFP_KERNEL); + if (!data) + return -ENOMEM; +@@ -237,8 +234,6 @@ static void ssu100_set_termios(struct tt + u16 urb_value = 0; /* will hold the new flags */ + int result; + +- dbg("%s", __func__); +- + if (cflag & PARENB) { + if (cflag & PARODD) + urb_value |= UART_LCR_PARITY; +@@ -312,8 +307,6 @@ static int ssu100_open(struct tty_struct + int result; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + data = kzalloc(2, GFP_KERNEL); + if (!data) + return -ENOMEM; +@@ -348,7 +341,6 @@ static int ssu100_open(struct tty_struct + + static void ssu100_close(struct usb_serial_port *port) + { +- dbg("%s", __func__); + usb_serial_generic_close(port); + } + +@@ -467,8 +459,6 @@ static int ssu100_attach(struct usb_seri + struct ssu100_port_private *priv; + struct usb_serial_port *port = *serial->port; + +- dbg("%s", __func__); +- + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) { + dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__, +@@ -490,8 +480,6 @@ static int ssu100_tiocmget(struct tty_st + u8 *d; + int r; + +- dbg("%s\n", __func__); +- + d = kzalloc(2, GFP_KERNEL); + if (!d) + return -ENOMEM; +@@ -522,7 +510,6 @@ static int ssu100_tiocmset(struct tty_st + struct usb_serial_port *port = tty->driver_data; + struct usb_device *dev = port->serial->dev; + +- dbg("%s\n", __func__); + return update_mctrl(dev, set, clear); + } + +@@ -530,8 +517,6 @@ static void ssu100_dtr_rts(struct usb_se + { + struct usb_device *dev = port->serial->dev; + +- dbg("%s\n", __func__); +- + mutex_lock(&port->serial->disc_mutex); + if (!port->serial->disconnected) { + /* Disable flow control */ +@@ -618,8 +603,6 @@ static int ssu100_process_packet(struct + int i; + char *ch; + +- dbg("%s - port %d", __func__, port->number); +- + if ((len >= 4) && + (packet[0] == 0x1b) && (packet[1] == 0x1b) && + ((packet[2] == 0x00) || (packet[2] == 0x01))) { +@@ -656,8 +639,6 @@ static void ssu100_process_read_urb(stru + struct tty_struct *tty; + int count; + +- dbg("%s", __func__); +- + tty = tty_port_tty_get(&port->port); + if (!tty) + return; +--- a/drivers/usb/serial/symbolserial.c ++++ b/drivers/usb/serial/symbolserial.c +@@ -54,8 +54,6 @@ static void symbol_int_callback(struct u + int result; + int data_length; + +- dbg("%s - port %d", __func__, port->number); +- + switch (status) { + case 0: + /* success */ +@@ -125,8 +123,6 @@ static int symbol_open(struct tty_struct + unsigned long flags; + int result = 0; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&priv->lock, flags); + priv->throttled = false; + priv->actually_throttled = false; +@@ -150,8 +146,6 @@ static void symbol_close(struct usb_seri + { + struct symbol_private *priv = usb_get_serial_data(port->serial); + +- dbg("%s - port %d", __func__, port->number); +- + /* shutdown our urbs */ + usb_kill_urb(priv->int_urb); + } +@@ -161,7 +155,6 @@ static void symbol_throttle(struct tty_s + struct usb_serial_port *port = tty->driver_data; + struct symbol_private *priv = usb_get_serial_data(port->serial); + +- dbg("%s - port %d", __func__, port->number); + spin_lock_irq(&priv->lock); + priv->throttled = true; + spin_unlock_irq(&priv->lock); +@@ -174,8 +167,6 @@ static void symbol_unthrottle(struct tty + int result; + bool was_throttled; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irq(&priv->lock); + priv->throttled = false; + was_throttled = priv->actually_throttled; +@@ -266,8 +257,6 @@ static void symbol_disconnect(struct usb + { + struct symbol_private *priv = usb_get_serial_data(serial); + +- dbg("%s", __func__); +- + usb_kill_urb(priv->int_urb); + usb_free_urb(priv->int_urb); + } +@@ -276,8 +265,6 @@ static void symbol_release(struct usb_se + { + struct symbol_private *priv = usb_get_serial_data(serial); + +- dbg("%s", __func__); +- + kfree(priv->int_buffer); + kfree(priv); + } +--- a/drivers/usb/serial/ti_usb_3410_5052.c ++++ b/drivers/usb/serial/ti_usb_3410_5052.c +@@ -463,8 +463,6 @@ static void ti_release(struct usb_serial + struct ti_device *tdev = usb_get_serial_data(serial); + struct ti_port *tport; + +- dbg("%s", __func__); +- + for (i = 0; i < serial->num_ports; ++i) { + tport = usb_get_serial_port_data(serial->port[i]); + if (tport) { +@@ -489,8 +487,6 @@ static int ti_open(struct tty_struct *tt + TI_PIPE_TIMEOUT_ENABLE | + (TI_TRANSFER_TIMEOUT << 2)); + +- dbg("%s - port %d", __func__, port->number); +- + if (tport == NULL) + return -ENODEV; + +@@ -631,8 +627,6 @@ static void ti_close(struct usb_serial_p + int status; + int do_unlock; + +- dbg("%s - port %d", __func__, port->number); +- + tdev = usb_get_serial_data(port->serial); + tport = usb_get_serial_port_data(port); + if (tdev == NULL || tport == NULL) +@@ -666,8 +660,6 @@ static void ti_close(struct usb_serial_p + } + if (do_unlock) + mutex_unlock(&tdev->td_open_close_lock); +- +- dbg("%s - exit", __func__); + } + + +@@ -676,8 +668,6 @@ static int ti_write(struct tty_struct *t + { + struct ti_port *tport = usb_get_serial_port_data(port); + +- dbg("%s - port %d", __func__, port->number); +- + if (count == 0) { + dbg("%s - write request of 0 bytes", __func__); + return 0; +@@ -701,8 +691,6 @@ static int ti_write_room(struct tty_stru + int room = 0; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + if (tport == NULL) + return 0; + +@@ -722,8 +710,6 @@ static int ti_chars_in_buffer(struct tty + int chars = 0; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + if (tport == NULL) + return 0; + +@@ -741,8 +727,6 @@ static void ti_throttle(struct tty_struc + struct usb_serial_port *port = tty->driver_data; + struct ti_port *tport = usb_get_serial_port_data(port); + +- dbg("%s - port %d", __func__, port->number); +- + if (tport == NULL) + return; + +@@ -758,8 +742,6 @@ static void ti_unthrottle(struct tty_str + struct ti_port *tport = usb_get_serial_port_data(port); + int status; + +- dbg("%s - port %d", __func__, port->number); +- + if (tport == NULL) + return; + +@@ -854,8 +836,6 @@ static void ti_set_termios(struct tty_st + int port_number = port->number - port->serial->minor; + unsigned int mcr; + +- dbg("%s - port %d", __func__, port->number); +- + cflag = tty->termios->c_cflag; + iflag = tty->termios->c_iflag; + +@@ -988,8 +968,6 @@ static int ti_tiocmget(struct tty_struct + unsigned int mcr; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + if (tport == NULL) + return -ENODEV; + +@@ -1020,8 +998,6 @@ static int ti_tiocmset(struct tty_struct + unsigned int mcr; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + if (tport == NULL) + return -ENODEV; + +@@ -1084,8 +1060,6 @@ static void ti_interrupt_callback(struct + int retval; + __u8 msr; + +- dbg("%s", __func__); +- + switch (status) { + case 0: + break; +@@ -1165,8 +1139,6 @@ static void ti_bulk_in_callback(struct u + int retval = 0; + struct tty_struct *tty; + +- dbg("%s", __func__); +- + switch (status) { + case 0: + break; +@@ -1233,8 +1205,6 @@ static void ti_bulk_out_callback(struct + struct usb_serial_port *port = tport->tp_port; + int status = urb->status; + +- dbg("%s - port %d", __func__, port->number); +- + tport->tp_write_urb_in_use = 0; + + switch (status) { +@@ -1287,9 +1257,6 @@ static void ti_send(struct ti_port *tpor + struct tty_struct *tty = tty_port_tty_get(&port->port); /* FIXME */ + unsigned long flags; + +- +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&tport->tp_lock, flags); + + if (tport->tp_write_urb_in_use) +@@ -1366,8 +1333,6 @@ static int ti_get_lsr(struct ti_port *tp + int port_number = port->number - port->serial->minor; + struct ti_port_status *data; + +- dbg("%s - port %d", __func__, port->number); +- + size = sizeof(struct ti_port_status); + data = kmalloc(size, GFP_KERNEL); + if (!data) { +@@ -1480,8 +1445,6 @@ static void ti_drain(struct ti_port *tpo + struct usb_serial_port *port = tport->tp_port; + wait_queue_t wait; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irq(&tport->tp_lock); + + /* wait for data to drain from the buffer */ +@@ -1679,7 +1642,6 @@ static int ti_download_firmware(struct t + const struct firmware *fw_p; + char buf[32]; + +- dbg("%s\n", __func__); + /* try ID specific firmware first, then try generic firmware */ + sprintf(buf, "ti_usb-v%04x-p%04x.fw", dev->descriptor.idVendor, + dev->descriptor.idProduct); +--- a/drivers/usb/serial/usb_wwan.c ++++ b/drivers/usb/serial/usb_wwan.c +@@ -43,11 +43,8 @@ void usb_wwan_dtr_rts(struct usb_serial_ + { + struct usb_serial *serial = port->serial; + struct usb_wwan_port_private *portdata; +- + struct usb_wwan_intf_private *intfdata; + +- dbg("%s", __func__); +- + intfdata = port->serial->private; + + if (!intfdata->send_setup) +@@ -69,8 +66,6 @@ void usb_wwan_set_termios(struct tty_str + { + struct usb_wwan_intf_private *intfdata = port->serial->private; + +- dbg("%s", __func__); +- + /* Doesn't support option setting */ + tty_termios_copy_hw(tty->termios, old_termios); + +@@ -286,8 +281,6 @@ static void usb_wwan_indat_callback(stru + unsigned char *data = urb->transfer_buffer; + int status = urb->status; + +- dbg("%s: %p", __func__, urb); +- + endpoint = usb_pipeendpoint(urb->pipe); + port = urb->context; + +@@ -331,8 +324,6 @@ static void usb_wwan_outdat_callback(str + struct usb_wwan_intf_private *intfdata; + int i; + +- dbg("%s", __func__); +- + port = urb->context; + intfdata = port->serial->private; + +@@ -406,8 +397,6 @@ int usb_wwan_open(struct tty_struct *tty + portdata = usb_get_serial_port_data(port); + intfdata = serial->private; + +- dbg("%s", __func__); +- + /* Start reading from the IN endpoint */ + for (i = 0; i < N_IN_URB; i++) { + urb = portdata->in_urbs[i]; +@@ -441,7 +430,6 @@ void usb_wwan_close(struct usb_serial_po + struct usb_wwan_port_private *portdata; + struct usb_wwan_intf_private *intfdata = port->serial->private; + +- dbg("%s", __func__); + portdata = usb_get_serial_port_data(port); + + if (serial->dev) { +@@ -492,8 +480,6 @@ static void usb_wwan_setup_urbs(struct u + struct usb_serial_port *port; + struct usb_wwan_port_private *portdata; + +- dbg("%s", __func__); +- + for (i = 0; i < serial->num_ports; i++) { + port = serial->port[i]; + portdata = usb_get_serial_port_data(port); +@@ -534,8 +520,6 @@ int usb_wwan_startup(struct usb_serial * + struct usb_wwan_port_private *portdata; + u8 *buffer; + +- dbg("%s", __func__); +- + /* Now setup per port private data */ + for (i = 0; i < serial->num_ports; i++) { + port = serial->port[i]; +@@ -603,8 +587,6 @@ static void stop_read_write_urbs(struct + + void usb_wwan_disconnect(struct usb_serial *serial) + { +- dbg("%s", __func__); +- + stop_read_write_urbs(serial); + } + EXPORT_SYMBOL(usb_wwan_disconnect); +@@ -615,8 +597,6 @@ void usb_wwan_release(struct usb_serial + struct usb_serial_port *port; + struct usb_wwan_port_private *portdata; + +- dbg("%s", __func__); +- + /* Now free them */ + for (i = 0; i < serial->num_ports; ++i) { + port = serial->port[i]; +@@ -649,8 +629,6 @@ int usb_wwan_suspend(struct usb_serial * + struct usb_wwan_intf_private *intfdata = serial->private; + int b; + +- dbg("%s entered", __func__); +- + if (PMSG_IS_AUTO(message)) { + spin_lock_irq(&intfdata->susp_lock); + b = intfdata->in_flight; +@@ -714,7 +692,6 @@ int usb_wwan_resume(struct usb_serial *s + struct urb *urb; + int err = 0; + +- dbg("%s entered", __func__); + /* get the interrupt URBs resubmitted unconditionally */ + for (i = 0; i < serial->num_ports; i++) { + port = serial->port[i]; --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c -@@ -244,7 +244,7 @@ static int visor_open(struct tty_struct +@@ -244,8 +244,6 @@ static int visor_open(struct tty_struct { int result = 0; - dbg("%s - port %d", __func__, port->number); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- if (!port->read_urb) { /* this is needed for some brain dead Sony devices */ -@@ -258,7 +258,7 @@ static int visor_open(struct tty_struct + dev_err(&port->dev, "Device lied about number of ports, please use a lower one.\n"); +@@ -258,7 +256,7 @@ static int visor_open(struct tty_struct goto exit; if (port->interrupt_in_urb) { @@ -342,16 +3474,16 @@ result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (result) dev_err(&port->dev, -@@ -274,7 +274,7 @@ static void visor_close(struct usb_seria +@@ -274,8 +272,6 @@ static void visor_close(struct usb_seria { unsigned char *transfer_buffer; - dbg("%s - port %d", __func__, port->number); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- /* shutdown our urbs */ usb_serial_generic_close(port); -@@ -310,12 +310,12 @@ static void visor_read_int_callback(stru + usb_kill_urb(port->interrupt_in_urb); +@@ -310,12 +306,12 @@ static void visor_read_int_callback(stru case -ENOENT: case -ESHUTDOWN: /* this urb is terminated, clean up */ @@ -368,52 +3500,43 @@ goto exit; } -@@ -348,7 +348,7 @@ static int palm_os_3_probe(struct usb_se +@@ -348,8 +344,6 @@ static int palm_os_3_probe(struct usb_se int i; int num_ports = 0; - dbg("%s", __func__); -+ dev_dbg(dev, "%s\n", __func__); - +- transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL); if (!transfer_buffer) { -@@ -445,7 +445,7 @@ static int palm_os_4_probe(struct usb_se + dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__, +@@ -445,8 +439,6 @@ static int palm_os_4_probe(struct usb_se unsigned char *transfer_buffer; int retval; - dbg("%s", __func__); -+ dev_dbg(dev, "%s\n", __func__); - +- transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL); if (!transfer_buffer) { -@@ -478,7 +478,7 @@ static int visor_probe(struct usb_serial + dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__, +@@ -478,8 +470,6 @@ static int visor_probe(struct usb_serial int (*startup)(struct usb_serial *serial, const struct usb_device_id *id); - dbg("%s", __func__); -+ dev_dbg(&serial->dev->dev, "%s\n", __func__); - +- /* * some Samsung Android phones in modem mode have the same ID -@@ -521,7 +521,7 @@ static int clie_3_5_startup(struct usb_s + * as SPH-I500, but they are ACM devices, so dont bind to them +@@ -521,8 +511,6 @@ static int clie_3_5_startup(struct usb_s int result; u8 *data; - dbg("%s", __func__); -+ dev_dbg(dev, "%s\n", __func__); - +- data = kmalloc(1, GFP_KERNEL); if (!data) -@@ -576,6 +576,8 @@ static int treo_attach(struct usb_serial - { - struct usb_serial_port *swap_port; - -+ dev_dbg(&serial->dev->dev, "%s\n", __func__); -+ - /* Only do this endpoint hack for the Handspring devices with - * interrupt in endpoints, which for now are the Treo devices. */ - if (!((le16_to_cpu(serial->dev->descriptor.idVendor) -@@ -585,8 +587,6 @@ static int treo_attach(struct usb_serial + return -ENOMEM; +@@ -585,8 +573,6 @@ static int treo_attach(struct usb_serial (serial->num_interrupt_in == 0)) return 0; @@ -422,12 +3545,149 @@ /* * It appears that Treos and Kyoceras want to use the * 1st bulk in endpoint to communicate with the 2nd bulk out endpoint, -@@ -622,7 +622,7 @@ static int clie_5_attach(struct usb_seri +@@ -622,8 +608,6 @@ static int clie_5_attach(struct usb_seri unsigned int pipe; int j; - dbg("%s", __func__); -+ dev_dbg(&port->dev, "%s\n", __func__); - +- /* TH55 registers 2 ports. Communication in from the UX50/TH55 uses bulk_in_endpointAddress + from port 0. Communication out to the UX50/TH55 uses +--- a/drivers/usb/serial/whiteheat.c ++++ b/drivers/usb/serial/whiteheat.c +@@ -247,8 +247,6 @@ static int whiteheat_firmware_download(s + const struct firmware *loader_fw = NULL, *firmware_fw = NULL; + const struct ihex_binrec *record; + +- dbg("%s", __func__); +- + if (request_ihex_firmware(&firmware_fw, "whiteheat.fw", + &serial->dev->dev)) { + dev_err(&serial->dev->dev, +@@ -577,8 +575,6 @@ static void whiteheat_release(struct usb + struct list_head *tmp2; + int i; + +- dbg("%s", __func__); +- + /* free up our private data for our command port */ + command_port = serial->port[COMMAND_PORT]; + kfree(usb_get_serial_port_data(command_port)); +@@ -610,8 +606,6 @@ static int whiteheat_open(struct tty_str + { + int retval = 0; + +- dbg("%s - port %d", __func__, port->number); +- + retval = start_command_port(port->serial); + if (retval) + goto exit; +@@ -665,8 +659,6 @@ static void whiteheat_close(struct usb_s + struct list_head *tmp; + struct list_head *tmp2; + +- dbg("%s - port %d", __func__, port->number); +- + firm_report_tx_done(port); + firm_close(port); + +@@ -711,8 +703,6 @@ static int whiteheat_write(struct tty_st + unsigned long flags; + struct list_head *tmp; + +- dbg("%s - port %d", __func__, port->number); +- + if (count == 0) { + dbg("%s - write request of 0 bytes", __func__); + return (0); +@@ -768,8 +758,6 @@ static int whiteheat_write_room(struct t + int room = 0; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&info->lock, flags); + list_for_each(tmp, &info->tx_urbs_free) + room++; +@@ -786,8 +774,6 @@ static int whiteheat_tiocmget(struct tty + struct whiteheat_private *info = usb_get_serial_port_data(port); + unsigned int modem_signals = 0; + +- dbg("%s - port %d", __func__, port->number); +- + firm_get_dtr_rts(port); + if (info->mcr & UART_MCR_DTR) + modem_signals |= TIOCM_DTR; +@@ -803,8 +789,6 @@ static int whiteheat_tiocmset(struct tty + struct usb_serial_port *port = tty->driver_data; + struct whiteheat_private *info = usb_get_serial_port_data(port); + +- dbg("%s - port %d", __func__, port->number); +- + if (set & TIOCM_RTS) + info->mcr |= UART_MCR_RTS; + if (set & TIOCM_DTR) +@@ -876,8 +860,6 @@ static int whiteheat_chars_in_buffer(str + int chars = 0; + unsigned long flags; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irqsave(&info->lock, flags); + list_for_each(tmp, &info->tx_urbs_submitted) { + wrap = list_entry(tmp, struct whiteheat_urb_wrap, list); +@@ -895,8 +877,6 @@ static void whiteheat_throttle(struct tt + struct usb_serial_port *port = tty->driver_data; + struct whiteheat_private *info = usb_get_serial_port_data(port); + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irq(&info->lock); + info->flags |= THROTTLED; + spin_unlock_irq(&info->lock); +@@ -909,8 +889,6 @@ static void whiteheat_unthrottle(struct + struct whiteheat_private *info = usb_get_serial_port_data(port); + int actually_throttled; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock_irq(&info->lock); + actually_throttled = info->flags & ACTUALLY_THROTTLED; + info->flags &= ~(THROTTLED | ACTUALLY_THROTTLED); +@@ -928,8 +906,6 @@ static void command_port_write_callback( + { + int status = urb->status; + +- dbg("%s", __func__); +- + if (status) { + dbg("nonzero urb status: %d", status); + return; +@@ -945,8 +921,6 @@ static void command_port_read_callback(s + unsigned char *data = urb->transfer_buffer; + int result; + +- dbg("%s", __func__); +- + command_info = usb_get_serial_port_data(command_port); + if (!command_info) { + dbg("%s - command_info is NULL, exiting.", __func__); +@@ -997,8 +971,6 @@ static void whiteheat_read_callback(stru + struct whiteheat_private *info = usb_get_serial_port_data(port); + int status = urb->status; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock(&info->lock); + wrap = urb_to_wrap(urb, &info->rx_urbs_submitted); + if (!wrap) { +@@ -1041,8 +1013,6 @@ static void whiteheat_write_callback(str + struct whiteheat_urb_wrap *wrap; + int status = urb->status; + +- dbg("%s - port %d", __func__, port->number); +- + spin_lock(&info->lock); + wrap = urb_to_wrap(urb, &info->tx_urbs_submitted); + if (!wrap) { @@ -1,8 +1,7 @@ # My specific stuff, at the top to make it easier to work stuff below. -usb-remove-config_usb_devicefs.patch +hfsplus-bugfixes.patch usb-rename-the-usb-misc-class-from-usb-to-usbmisc.patch modpost-use-proper-kernel-style-for-autogenerated-files.patch -usb-remove-config_usb_device_class.patch printk.patch ipaq.patch visor.patch diff --git a/usb-remove-config_usb_device_class.patch b/usb-remove-config_usb_device_class.patch deleted file mode 100644 index b316061672dd3c..00000000000000 --- a/usb-remove-config_usb_device_class.patch +++ /dev/null @@ -1,144 +0,0 @@ -From foo@baz Wed Apr 25 15:23:48 PDT 2012 -Date: Wed, 25 Apr 2012 15:23:48 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: [RFC PATCH] USB: remove CONFIG_USB_DEVICE_CLASS - -This option has been deprecated for many years now, and no userspace -tools use it anymore, so it should be safe to finally remove it. - -Reported-by: Kay Sievers <kay@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - -Anyone object to me queuing this up for the 3.5 kernel release? - - drivers/usb/core/Kconfig | 23 ---------------------- - drivers/usb/core/devio.c | 49 ----------------------------------------------- - include/linux/usb.h | 3 -- - 3 files changed, 75 deletions(-) - ---- a/drivers/usb/core/Kconfig -+++ b/drivers/usb/core/Kconfig -@@ -56,29 +56,6 @@ config USB_DEVICEFS - The usbfs functionality is replaced by real device-nodes managed by - udev. These nodes lived in /dev/bus/usb and are used by libusb. - --config USB_DEVICE_CLASS -- bool "USB device class-devices (DEPRECATED)" -- depends on USB -- default y -- ---help--- -- Userspace access to USB devices is granted by device-nodes exported -- directly from the usbdev in sysfs. Old versions of the driver -- core and udev needed additional class devices to export device nodes. -- -- These additional devices are difficult to handle in userspace, if -- information about USB interfaces must be available. One device -- contains the device node, the other device contains the interface -- data. Both devices are at the same level in sysfs (siblings) and one -- can't access the other. The device node created directly by the -- usb device is the parent device of the interface and therefore -- easily accessible from the interface event. -- -- This option provides backward compatibility for libusb device -- nodes (lsusb) when usbfs is not used, and the following udev rule -- doesn't exist: -- SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \ -- NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644" -- - config USB_DYNAMIC_MINORS - bool "Dynamic USB minor allocation" - depends on USB ---- a/drivers/usb/core/devio.c -+++ b/drivers/usb/core/devio.c -@@ -2062,44 +2062,13 @@ static void usbdev_remove(struct usb_dev - } - } - --#ifdef CONFIG_USB_DEVICE_CLASS --static struct class *usb_classdev_class; -- --static int usb_classdev_add(struct usb_device *dev) --{ -- struct device *cldev; -- -- cldev = device_create(usb_classdev_class, &dev->dev, dev->dev.devt, -- NULL, "usbdev%d.%d", dev->bus->busnum, -- dev->devnum); -- if (IS_ERR(cldev)) -- return PTR_ERR(cldev); -- dev->usb_classdev = cldev; -- return 0; --} -- --static void usb_classdev_remove(struct usb_device *dev) --{ -- if (dev->usb_classdev) -- device_unregister(dev->usb_classdev); --} -- --#else --#define usb_classdev_add(dev) 0 --#define usb_classdev_remove(dev) do {} while (0) -- --#endif -- - static int usbdev_notify(struct notifier_block *self, - unsigned long action, void *dev) - { - switch (action) { - case USB_DEVICE_ADD: -- if (usb_classdev_add(dev)) -- return NOTIFY_BAD; - break; - case USB_DEVICE_REMOVE: -- usb_classdev_remove(dev); - usbdev_remove(dev); - break; - } -@@ -2129,21 +2098,6 @@ int __init usb_devio_init(void) - USB_DEVICE_MAJOR); - goto error_cdev; - } --#ifdef CONFIG_USB_DEVICE_CLASS -- usb_classdev_class = class_create(THIS_MODULE, "usb_device"); -- if (IS_ERR(usb_classdev_class)) { -- printk(KERN_ERR "Unable to register usb_device class\n"); -- retval = PTR_ERR(usb_classdev_class); -- cdev_del(&usb_device_cdev); -- usb_classdev_class = NULL; -- goto out; -- } -- /* devices of this class shadow the major:minor of their parent -- * device, so clear ->dev_kobj to prevent adding duplicate entries -- * to /sys/dev -- */ -- usb_classdev_class->dev_kobj = NULL; --#endif - usb_register_notify(&usbdev_nb); - out: - return retval; -@@ -2156,9 +2110,6 @@ error_cdev: - void usb_devio_cleanup(void) - { - usb_unregister_notify(&usbdev_nb); --#ifdef CONFIG_USB_DEVICE_CLASS -- class_destroy(usb_classdev_class); --#endif - cdev_del(&usb_device_cdev); - unregister_chrdev_region(USB_DEVICE_DEV, USB_DEVICE_MAX); - } ---- a/include/linux/usb.h -+++ b/include/linux/usb.h -@@ -493,9 +493,6 @@ struct usb_device { - char *serial; - - struct list_head filelist; --#ifdef CONFIG_USB_DEVICE_CLASS -- struct device *usb_classdev; --#endif - #ifdef CONFIG_USB_DEVICEFS - struct dentry *usbfs_dentry; - #endif diff --git a/usb-remove-config_usb_devicefs.patch b/usb-remove-config_usb_devicefs.patch deleted file mode 100644 index 41f58804dc45b2..00000000000000 --- a/usb-remove-config_usb_devicefs.patch +++ /dev/null @@ -1,1020 +0,0 @@ -From foo@baz Wed Apr 25 17:13:18 PDT 2012 -Date: Wed, 25 Apr 2012 17:13:18 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: [RFC PATCH] USB: remove CONFIG_USB_DEVICEFS - -This option has been deprecated for many years now, and no userspace -tools use it anymore, so it should be safe to finally remove it. - -Reported-by: Kay Sievers <kay@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- -Anyone object to me queuing this up for the 3.5 kernel release? - - drivers/staging/media/go7007/go7007.txt | 1 - - drivers/usb/core/Kconfig | 29 -- - drivers/usb/core/Makefile | 1 - - drivers/usb/core/devio.c | 11 - - drivers/usb/core/driver.c | 21 +- - drivers/usb/core/inode.c | 748 ------------------------------- - drivers/usb/core/usb.c | 6 - - include/linux/usb.h | 7 - - include/linux/usb/hcd.h | 23 - - 9 files changed, 2 insertions(+), 845 deletions(-) - -diff --git a/drivers/staging/media/go7007/go7007.txt b/drivers/staging/media/go7007/go7007.txt -index 9db1f39..fcb3e23 100644 ---- a/drivers/staging/media/go7007/go7007.txt -+++ b/drivers/staging/media/go7007/go7007.txt -@@ -87,7 +87,6 @@ kernel as built-in or modules: - CONFIG_SOUND - Sound card support - CONFIG_SND - Advanced Linux Sound Architecture - CONFIG_USB - Support for Host-side USB -- CONFIG_USB_DEVICEFS - USB device filesystem - CONFIG_USB_EHCI_HCD - EHCI HCD (USB 2.0) support - - Additionally, to use the example application, the following options need to -diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig -index 18d02e3..751031e 100644 ---- a/drivers/usb/core/Kconfig -+++ b/drivers/usb/core/Kconfig -@@ -27,35 +27,6 @@ config USB_ANNOUNCE_NEW_DEVICES - comment "Miscellaneous USB options" - depends on USB - --config USB_DEVICEFS -- bool "USB device filesystem (DEPRECATED)" -- depends on USB -- ---help--- -- If you say Y here (and to "/proc file system support" in the "File -- systems" section, above), you will get a file /proc/bus/usb/devices -- which lists the devices currently connected to your USB bus or -- busses, and for every connected device a file named -- "/proc/bus/usb/xxx/yyy", where xxx is the bus number and yyy the -- device number; the latter files can be used by user space programs -- to talk directly to the device. These files are "virtual", meaning -- they are generated on the fly and not stored on the hard drive. -- -- You may need to mount the usbfs file system to see the files, use -- mount -t usbfs none /proc/bus/usb -- -- For the format of the various /proc/bus/usb/ files, please read -- <file:Documentation/usb/proc_usb_info.txt>. -- -- Modern Linux systems do not use this. -- -- Usbfs entries are files and not character devices; usbfs can't -- handle Access Control Lists (ACL) which are the default way to -- grant access to USB devices for untrusted users of a desktop -- system. -- -- The usbfs functionality is replaced by real device-nodes managed by -- udev. These nodes lived in /dev/bus/usb and are used by libusb. -- - config USB_DEVICE_CLASS - bool "USB device class-devices (DEPRECATED)" - depends on USB -diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile -index 507a4e1..c4ea846 100644 ---- a/drivers/usb/core/Makefile -+++ b/drivers/usb/core/Makefile -@@ -9,6 +9,5 @@ usbcore-y += config.o file.o buffer.o sysfs.o endpoint.o - usbcore-y += devio.o notify.o generic.o quirks.o devices.o - - usbcore-$(CONFIG_PCI) += hcd-pci.o --usbcore-$(CONFIG_USB_DEVICEFS) += inode.o - - obj-$(CONFIG_USB) += usbcore.o -diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c -index 8df4b76..90db6e2 100644 ---- a/drivers/usb/core/devio.c -+++ b/drivers/usb/core/devio.c -@@ -727,17 +727,6 @@ static int usbdev_open(struct inode *inode, struct file *file) - if (imajor(inode) == USB_DEVICE_MAJOR) - dev = usbdev_lookup_by_devt(inode->i_rdev); - --#ifdef CONFIG_USB_DEVICEFS -- /* procfs file */ -- if (!dev) { -- dev = inode->i_private; -- if (dev && dev->usbfs_dentry && -- dev->usbfs_dentry->d_inode == inode) -- usb_get_dev(dev); -- else -- dev = NULL; -- } --#endif - mutex_unlock(&usbfs_mutex); - - if (!dev) -diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c -index 9a56635..112a7ae 100644 ---- a/drivers/usb/core/driver.c -+++ b/drivers/usb/core/driver.c -@@ -726,16 +726,6 @@ static int usb_uevent(struct device *dev, struct kobj_uevent_env *env) - return -ENODEV; - } - --#ifdef CONFIG_USB_DEVICEFS -- /* If this is available, userspace programs can directly read -- * all the device descriptors we don't tell them about. Or -- * act as usermode drivers. -- */ -- if (add_uevent_var(env, "DEVICE=/proc/bus/usb/%03d/%03d", -- usb_dev->bus->busnum, usb_dev->devnum)) -- return -ENOMEM; --#endif -- - /* per-device configurations are common */ - if (add_uevent_var(env, "PRODUCT=%x/%x/%x", - le16_to_cpu(usb_dev->descriptor.idVendor), -@@ -788,15 +778,13 @@ int usb_register_device_driver(struct usb_device_driver *new_udriver, - - retval = driver_register(&new_udriver->drvwrap.driver); - -- if (!retval) { -+ if (!retval) - pr_info("%s: registered new device driver %s\n", - usbcore_name, new_udriver->name); -- usbfs_update_special(); -- } else { -+ else - printk(KERN_ERR "%s: error %d registering device " - " driver %s\n", - usbcore_name, retval, new_udriver->name); -- } - - return retval; - } -@@ -815,7 +803,6 @@ void usb_deregister_device_driver(struct usb_device_driver *udriver) - usbcore_name, udriver->name); - - driver_unregister(&udriver->drvwrap.driver); -- usbfs_update_special(); - } - EXPORT_SYMBOL_GPL(usb_deregister_device_driver); - -@@ -856,8 +843,6 @@ int usb_register_driver(struct usb_driver *new_driver, struct module *owner, - if (retval) - goto out; - -- usbfs_update_special(); -- - retval = usb_create_newid_files(new_driver); - if (retval) - goto out_newid; -@@ -897,8 +882,6 @@ void usb_deregister(struct usb_driver *driver) - usb_remove_newid_files(driver); - driver_unregister(&driver->drvwrap.driver); - usb_free_dynids(driver); -- -- usbfs_update_special(); - } - EXPORT_SYMBOL_GPL(usb_deregister); - -diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c -deleted file mode 100644 -index d2b9af5..0000000 ---- a/drivers/usb/core/inode.c -+++ /dev/null -@@ -1,748 +0,0 @@ --/*****************************************************************************/ -- --/* -- * inode.c -- Inode/Dentry functions for the USB device file system. -- * -- * Copyright (C) 2000 Thomas Sailer (sailer@ife.ee.ethz.ch) -- * Copyright (C) 2001,2002,2004 Greg Kroah-Hartman (greg@kroah.com) -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -- * -- * History: -- * 0.1 04.01.2000 Created -- * 0.2 10.12.2001 converted to use the vfs layer better -- */ -- --/*****************************************************************************/ -- --#include <linux/module.h> --#include <linux/fs.h> --#include <linux/mount.h> --#include <linux/pagemap.h> --#include <linux/init.h> --#include <linux/proc_fs.h> --#include <linux/usb.h> --#include <linux/namei.h> --#include <linux/usbdevice_fs.h> --#include <linux/parser.h> --#include <linux/notifier.h> --#include <linux/seq_file.h> --#include <linux/usb/hcd.h> --#include <asm/byteorder.h> --#include "usb.h" -- --#define USBFS_DEFAULT_DEVMODE (S_IWUSR | S_IRUGO) --#define USBFS_DEFAULT_BUSMODE (S_IXUGO | S_IRUGO) --#define USBFS_DEFAULT_LISTMODE S_IRUGO -- --static const struct file_operations default_file_operations; --static struct vfsmount *usbfs_mount; --static int usbfs_mount_count; /* = 0 */ -- --static struct dentry *devices_usbfs_dentry; --static int num_buses; /* = 0 */ -- --static uid_t devuid; /* = 0 */ --static uid_t busuid; /* = 0 */ --static uid_t listuid; /* = 0 */ --static gid_t devgid; /* = 0 */ --static gid_t busgid; /* = 0 */ --static gid_t listgid; /* = 0 */ --static umode_t devmode = USBFS_DEFAULT_DEVMODE; --static umode_t busmode = USBFS_DEFAULT_BUSMODE; --static umode_t listmode = USBFS_DEFAULT_LISTMODE; -- --static int usbfs_show_options(struct seq_file *seq, struct dentry *root) --{ -- if (devuid != 0) -- seq_printf(seq, ",devuid=%u", devuid); -- if (devgid != 0) -- seq_printf(seq, ",devgid=%u", devgid); -- if (devmode != USBFS_DEFAULT_DEVMODE) -- seq_printf(seq, ",devmode=%o", devmode); -- if (busuid != 0) -- seq_printf(seq, ",busuid=%u", busuid); -- if (busgid != 0) -- seq_printf(seq, ",busgid=%u", busgid); -- if (busmode != USBFS_DEFAULT_BUSMODE) -- seq_printf(seq, ",busmode=%o", busmode); -- if (listuid != 0) -- seq_printf(seq, ",listuid=%u", listuid); -- if (listgid != 0) -- seq_printf(seq, ",listgid=%u", listgid); -- if (listmode != USBFS_DEFAULT_LISTMODE) -- seq_printf(seq, ",listmode=%o", listmode); -- -- return 0; --} -- --enum { -- Opt_devuid, Opt_devgid, Opt_devmode, -- Opt_busuid, Opt_busgid, Opt_busmode, -- Opt_listuid, Opt_listgid, Opt_listmode, -- Opt_err, --}; -- --static const match_table_t tokens = { -- {Opt_devuid, "devuid=%u"}, -- {Opt_devgid, "devgid=%u"}, -- {Opt_devmode, "devmode=%o"}, -- {Opt_busuid, "busuid=%u"}, -- {Opt_busgid, "busgid=%u"}, -- {Opt_busmode, "busmode=%o"}, -- {Opt_listuid, "listuid=%u"}, -- {Opt_listgid, "listgid=%u"}, -- {Opt_listmode, "listmode=%o"}, -- {Opt_err, NULL} --}; -- --static int parse_options(struct super_block *s, char *data) --{ -- char *p; -- int option; -- -- /* (re)set to defaults. */ -- devuid = 0; -- busuid = 0; -- listuid = 0; -- devgid = 0; -- busgid = 0; -- listgid = 0; -- devmode = USBFS_DEFAULT_DEVMODE; -- busmode = USBFS_DEFAULT_BUSMODE; -- listmode = USBFS_DEFAULT_LISTMODE; -- -- while ((p = strsep(&data, ",")) != NULL) { -- substring_t args[MAX_OPT_ARGS]; -- int token; -- if (!*p) -- continue; -- -- token = match_token(p, tokens, args); -- switch (token) { -- case Opt_devuid: -- if (match_int(&args[0], &option)) -- return -EINVAL; -- devuid = option; -- break; -- case Opt_devgid: -- if (match_int(&args[0], &option)) -- return -EINVAL; -- devgid = option; -- break; -- case Opt_devmode: -- if (match_octal(&args[0], &option)) -- return -EINVAL; -- devmode = option & S_IRWXUGO; -- break; -- case Opt_busuid: -- if (match_int(&args[0], &option)) -- return -EINVAL; -- busuid = option; -- break; -- case Opt_busgid: -- if (match_int(&args[0], &option)) -- return -EINVAL; -- busgid = option; -- break; -- case Opt_busmode: -- if (match_octal(&args[0], &option)) -- return -EINVAL; -- busmode = option & S_IRWXUGO; -- break; -- case Opt_listuid: -- if (match_int(&args[0], &option)) -- return -EINVAL; -- listuid = option; -- break; -- case Opt_listgid: -- if (match_int(&args[0], &option)) -- return -EINVAL; -- listgid = option; -- break; -- case Opt_listmode: -- if (match_octal(&args[0], &option)) -- return -EINVAL; -- listmode = option & S_IRWXUGO; -- break; -- default: -- printk(KERN_ERR "usbfs: unrecognised mount option " -- "\"%s\" or missing value\n", p); -- return -EINVAL; -- } -- } -- -- return 0; --} -- --static void update_special(struct dentry *special) --{ -- special->d_inode->i_uid = listuid; -- special->d_inode->i_gid = listgid; -- special->d_inode->i_mode = S_IFREG | listmode; --} -- --static void update_dev(struct dentry *dev) --{ -- dev->d_inode->i_uid = devuid; -- dev->d_inode->i_gid = devgid; -- dev->d_inode->i_mode = S_IFREG | devmode; --} -- --static void update_bus(struct dentry *bus) --{ -- struct dentry *dev = NULL; -- -- bus->d_inode->i_uid = busuid; -- bus->d_inode->i_gid = busgid; -- bus->d_inode->i_mode = S_IFDIR | busmode; -- -- mutex_lock(&bus->d_inode->i_mutex); -- -- list_for_each_entry(dev, &bus->d_subdirs, d_u.d_child) -- if (dev->d_inode) -- update_dev(dev); -- -- mutex_unlock(&bus->d_inode->i_mutex); --} -- --static void update_sb(struct super_block *sb) --{ -- struct dentry *root = sb->s_root; -- struct dentry *bus = NULL; -- -- if (!root) -- return; -- -- mutex_lock_nested(&root->d_inode->i_mutex, I_MUTEX_PARENT); -- -- list_for_each_entry(bus, &root->d_subdirs, d_u.d_child) { -- if (bus->d_inode) { -- switch (S_IFMT & bus->d_inode->i_mode) { -- case S_IFDIR: -- update_bus(bus); -- break; -- case S_IFREG: -- update_special(bus); -- break; -- default: -- printk(KERN_WARNING "usbfs: Unknown node %s " -- "mode %x found on remount!\n", -- bus->d_name.name, bus->d_inode->i_mode); -- break; -- } -- } -- } -- -- mutex_unlock(&root->d_inode->i_mutex); --} -- --static int remount(struct super_block *sb, int *flags, char *data) --{ -- /* If this is not a real mount, -- * i.e. it's a simple_pin_fs from create_special_files, -- * then ignore it. -- */ -- if (*flags & MS_KERNMOUNT) -- return 0; -- -- if (parse_options(sb, data)) { -- printk(KERN_WARNING "usbfs: mount parameter error.\n"); -- return -EINVAL; -- } -- -- if (usbfs_mount) -- update_sb(usbfs_mount->mnt_sb); -- -- return 0; --} -- --static struct inode *usbfs_get_inode (struct super_block *sb, umode_t mode, dev_t dev) --{ -- struct inode *inode = new_inode(sb); -- -- if (inode) { -- inode->i_ino = get_next_ino(); -- inode_init_owner(inode, NULL, mode); -- inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; -- switch (mode & S_IFMT) { -- default: -- init_special_inode(inode, mode, dev); -- break; -- case S_IFREG: -- inode->i_fop = &default_file_operations; -- break; -- case S_IFDIR: -- inode->i_op = &simple_dir_inode_operations; -- inode->i_fop = &simple_dir_operations; -- -- /* directory inodes start off with i_nlink == 2 (for "." entry) */ -- inc_nlink(inode); -- break; -- } -- } -- return inode; --} -- --/* SMP-safe */ --static int usbfs_mknod (struct inode *dir, struct dentry *dentry, umode_t mode, -- dev_t dev) --{ -- struct inode *inode = usbfs_get_inode(dir->i_sb, mode, dev); -- int error = -EPERM; -- -- if (dentry->d_inode) -- return -EEXIST; -- -- if (inode) { -- d_instantiate(dentry, inode); -- dget(dentry); -- error = 0; -- } -- return error; --} -- --static int usbfs_mkdir (struct inode *dir, struct dentry *dentry, umode_t mode) --{ -- int res; -- -- mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR; -- res = usbfs_mknod (dir, dentry, mode, 0); -- if (!res) -- inc_nlink(dir); -- return res; --} -- --static int usbfs_create (struct inode *dir, struct dentry *dentry, umode_t mode) --{ -- mode = (mode & S_IALLUGO) | S_IFREG; -- return usbfs_mknod (dir, dentry, mode, 0); --} -- --static inline int usbfs_positive (struct dentry *dentry) --{ -- return dentry->d_inode && !d_unhashed(dentry); --} -- --static int usbfs_empty (struct dentry *dentry) --{ -- struct list_head *list; -- -- spin_lock(&dentry->d_lock); -- list_for_each(list, &dentry->d_subdirs) { -- struct dentry *de = list_entry(list, struct dentry, d_u.d_child); -- -- spin_lock_nested(&de->d_lock, DENTRY_D_LOCK_NESTED); -- if (usbfs_positive(de)) { -- spin_unlock(&de->d_lock); -- spin_unlock(&dentry->d_lock); -- return 0; -- } -- spin_unlock(&de->d_lock); -- } -- spin_unlock(&dentry->d_lock); -- return 1; --} -- --static int usbfs_unlink (struct inode *dir, struct dentry *dentry) --{ -- struct inode *inode = dentry->d_inode; -- mutex_lock(&inode->i_mutex); -- drop_nlink(dentry->d_inode); -- dput(dentry); -- mutex_unlock(&inode->i_mutex); -- d_delete(dentry); -- return 0; --} -- --static int usbfs_rmdir(struct inode *dir, struct dentry *dentry) --{ -- int error = -ENOTEMPTY; -- struct inode * inode = dentry->d_inode; -- -- mutex_lock(&inode->i_mutex); -- dentry_unhash(dentry); -- if (usbfs_empty(dentry)) { -- dont_mount(dentry); -- drop_nlink(dentry->d_inode); -- drop_nlink(dentry->d_inode); -- dput(dentry); -- inode->i_flags |= S_DEAD; -- drop_nlink(dir); -- error = 0; -- } -- mutex_unlock(&inode->i_mutex); -- if (!error) -- d_delete(dentry); -- return error; --} -- -- --/* default file operations */ --static ssize_t default_read_file (struct file *file, char __user *buf, -- size_t count, loff_t *ppos) --{ -- return 0; --} -- --static ssize_t default_write_file (struct file *file, const char __user *buf, -- size_t count, loff_t *ppos) --{ -- return count; --} -- --static loff_t default_file_lseek (struct file *file, loff_t offset, int orig) --{ -- loff_t retval = -EINVAL; -- -- mutex_lock(&file->f_path.dentry->d_inode->i_mutex); -- switch(orig) { -- case 0: -- if (offset > 0) { -- file->f_pos = offset; -- retval = file->f_pos; -- } -- break; -- case 1: -- if ((offset + file->f_pos) > 0) { -- file->f_pos += offset; -- retval = file->f_pos; -- } -- break; -- default: -- break; -- } -- mutex_unlock(&file->f_path.dentry->d_inode->i_mutex); -- return retval; --} -- --static const struct file_operations default_file_operations = { -- .read = default_read_file, -- .write = default_write_file, -- .open = simple_open, -- .llseek = default_file_lseek, --}; -- --static const struct super_operations usbfs_ops = { -- .statfs = simple_statfs, -- .drop_inode = generic_delete_inode, -- .remount_fs = remount, -- .show_options = usbfs_show_options, --}; -- --static int usbfs_fill_super(struct super_block *sb, void *data, int silent) --{ -- struct inode *inode; -- -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -- sb->s_magic = USBDEVICE_SUPER_MAGIC; -- sb->s_op = &usbfs_ops; -- sb->s_time_gran = 1; -- inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0); -- sb->s_root = d_make_root(inode); -- if (!sb->s_root) { -- dbg("%s: could not get root dentry!",__func__); -- return -ENOMEM; -- } -- return 0; --} -- --/* -- * fs_create_by_name - create a file, given a name -- * @name: name of file -- * @mode: type of file -- * @parent: dentry of directory to create it in -- * @dentry: resulting dentry of file -- * -- * This function handles both regular files and directories. -- */ --static int fs_create_by_name (const char *name, umode_t mode, -- struct dentry *parent, struct dentry **dentry) --{ -- int error = 0; -- -- /* If the parent is not specified, we create it in the root. -- * We need the root dentry to do this, which is in the super -- * block. A pointer to that is in the struct vfsmount that we -- * have around. -- */ -- if (!parent ) { -- if (usbfs_mount) -- parent = usbfs_mount->mnt_root; -- } -- -- if (!parent) { -- dbg("Ah! can not find a parent!"); -- return -EFAULT; -- } -- -- *dentry = NULL; -- mutex_lock(&parent->d_inode->i_mutex); -- *dentry = lookup_one_len(name, parent, strlen(name)); -- if (!IS_ERR(*dentry)) { -- if (S_ISDIR(mode)) -- error = usbfs_mkdir (parent->d_inode, *dentry, mode); -- else -- error = usbfs_create (parent->d_inode, *dentry, mode); -- } else -- error = PTR_ERR(*dentry); -- mutex_unlock(&parent->d_inode->i_mutex); -- -- return error; --} -- --static struct dentry *fs_create_file (const char *name, umode_t mode, -- struct dentry *parent, void *data, -- const struct file_operations *fops, -- uid_t uid, gid_t gid) --{ -- struct dentry *dentry; -- int error; -- -- dbg("creating file '%s'",name); -- -- error = fs_create_by_name (name, mode, parent, &dentry); -- if (error) { -- dentry = NULL; -- } else { -- if (dentry->d_inode) { -- if (data) -- dentry->d_inode->i_private = data; -- if (fops) -- dentry->d_inode->i_fop = fops; -- dentry->d_inode->i_uid = uid; -- dentry->d_inode->i_gid = gid; -- } -- } -- -- return dentry; --} -- --static void fs_remove_file (struct dentry *dentry) --{ -- struct dentry *parent = dentry->d_parent; -- -- if (!parent || !parent->d_inode) -- return; -- -- mutex_lock_nested(&parent->d_inode->i_mutex, I_MUTEX_PARENT); -- if (usbfs_positive(dentry)) { -- if (dentry->d_inode) { -- if (S_ISDIR(dentry->d_inode->i_mode)) -- usbfs_rmdir(parent->d_inode, dentry); -- else -- usbfs_unlink(parent->d_inode, dentry); -- dput(dentry); -- } -- } -- mutex_unlock(&parent->d_inode->i_mutex); --} -- --/* --------------------------------------------------------------------- */ -- --static struct dentry *usb_mount(struct file_system_type *fs_type, -- int flags, const char *dev_name, void *data) --{ -- return mount_single(fs_type, flags, data, usbfs_fill_super); --} -- --static struct file_system_type usb_fs_type = { -- .owner = THIS_MODULE, -- .name = "usbfs", -- .mount = usb_mount, -- .kill_sb = kill_litter_super, --}; -- --/* --------------------------------------------------------------------- */ -- --static int create_special_files (void) --{ -- struct dentry *parent; -- int retval; -- -- /* create the devices special file */ -- retval = simple_pin_fs(&usb_fs_type, &usbfs_mount, &usbfs_mount_count); -- if (retval) { -- printk(KERN_ERR "Unable to get usbfs mount\n"); -- goto exit; -- } -- -- parent = usbfs_mount->mnt_root; -- devices_usbfs_dentry = fs_create_file ("devices", -- listmode | S_IFREG, parent, -- NULL, &usbfs_devices_fops, -- listuid, listgid); -- if (devices_usbfs_dentry == NULL) { -- printk(KERN_ERR "Unable to create devices usbfs file\n"); -- retval = -ENODEV; -- goto error_clean_mounts; -- } -- -- goto exit; -- --error_clean_mounts: -- simple_release_fs(&usbfs_mount, &usbfs_mount_count); --exit: -- return retval; --} -- --static void remove_special_files (void) --{ -- if (devices_usbfs_dentry) -- fs_remove_file (devices_usbfs_dentry); -- devices_usbfs_dentry = NULL; -- simple_release_fs(&usbfs_mount, &usbfs_mount_count); --} -- --void usbfs_update_special (void) --{ -- struct inode *inode; -- -- if (devices_usbfs_dentry) { -- inode = devices_usbfs_dentry->d_inode; -- if (inode) -- inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; -- } --} -- --static void usbfs_add_bus(struct usb_bus *bus) --{ -- struct dentry *parent; -- char name[8]; -- int retval; -- -- /* create the special files if this is the first bus added */ -- if (num_buses == 0) { -- retval = create_special_files(); -- if (retval) -- return; -- } -- ++num_buses; -- -- sprintf (name, "%03d", bus->busnum); -- -- parent = usbfs_mount->mnt_root; -- bus->usbfs_dentry = fs_create_file (name, busmode | S_IFDIR, parent, -- bus, NULL, busuid, busgid); -- if (bus->usbfs_dentry == NULL) { -- printk(KERN_ERR "Error creating usbfs bus entry\n"); -- return; -- } --} -- --static void usbfs_remove_bus(struct usb_bus *bus) --{ -- if (bus->usbfs_dentry) { -- fs_remove_file (bus->usbfs_dentry); -- bus->usbfs_dentry = NULL; -- } -- -- --num_buses; -- if (num_buses <= 0) { -- remove_special_files(); -- num_buses = 0; -- } --} -- --static void usbfs_add_device(struct usb_device *dev) --{ -- char name[8]; -- int i; -- int i_size; -- -- sprintf (name, "%03d", dev->devnum); -- dev->usbfs_dentry = fs_create_file (name, devmode | S_IFREG, -- dev->bus->usbfs_dentry, dev, -- &usbdev_file_operations, -- devuid, devgid); -- if (dev->usbfs_dentry == NULL) { -- printk(KERN_ERR "Error creating usbfs device entry\n"); -- return; -- } -- -- /* Set the size of the device's file to be -- * equal to the size of the device descriptors. */ -- i_size = sizeof (struct usb_device_descriptor); -- for (i = 0; i < dev->descriptor.bNumConfigurations; ++i) { -- struct usb_config_descriptor *config = -- (struct usb_config_descriptor *)dev->rawdescriptors[i]; -- i_size += le16_to_cpu(config->wTotalLength); -- } -- if (dev->usbfs_dentry->d_inode) -- dev->usbfs_dentry->d_inode->i_size = i_size; --} -- --static void usbfs_remove_device(struct usb_device *dev) --{ -- if (dev->usbfs_dentry) { -- fs_remove_file (dev->usbfs_dentry); -- dev->usbfs_dentry = NULL; -- } --} -- --static int usbfs_notify(struct notifier_block *self, unsigned long action, void *dev) --{ -- switch (action) { -- case USB_DEVICE_ADD: -- usbfs_add_device(dev); -- break; -- case USB_DEVICE_REMOVE: -- usbfs_remove_device(dev); -- break; -- case USB_BUS_ADD: -- usbfs_add_bus(dev); -- break; -- case USB_BUS_REMOVE: -- usbfs_remove_bus(dev); -- } -- -- usbfs_update_special(); -- usbfs_conn_disc_event(); -- return NOTIFY_OK; --} -- --static struct notifier_block usbfs_nb = { -- .notifier_call = usbfs_notify, --}; -- --/* --------------------------------------------------------------------- */ -- --static struct proc_dir_entry *usbdir = NULL; -- --int __init usbfs_init(void) --{ -- int retval; -- -- retval = register_filesystem(&usb_fs_type); -- if (retval) -- return retval; -- -- usb_register_notify(&usbfs_nb); -- -- /* create mount point for usbfs */ -- usbdir = proc_mkdir("bus/usb", NULL); -- -- return 0; --} -- --void usbfs_cleanup(void) --{ -- usb_unregister_notify(&usbfs_nb); -- unregister_filesystem(&usb_fs_type); -- if (usbdir) -- remove_proc_entry("bus/usb", NULL); --} -- -diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c -index c74ba7b..0ce862b 100644 ---- a/drivers/usb/core/usb.c -+++ b/drivers/usb/core/usb.c -@@ -1030,9 +1030,6 @@ static int __init usb_init(void) - retval = usb_devio_init(); - if (retval) - goto usb_devio_init_failed; -- retval = usbfs_init(); -- if (retval) -- goto fs_init_failed; - retval = usb_hub_init(); - if (retval) - goto hub_init_failed; -@@ -1042,8 +1039,6 @@ static int __init usb_init(void) - - usb_hub_cleanup(); - hub_init_failed: -- usbfs_cleanup(); --fs_init_failed: - usb_devio_cleanup(); - usb_devio_init_failed: - usb_deregister(&usbfs_driver); -@@ -1070,7 +1065,6 @@ static void __exit usb_exit(void) - - usb_deregister_device_driver(&usb_generic_driver); - usb_major_cleanup(); -- usbfs_cleanup(); - usb_deregister(&usbfs_driver); - usb_devio_cleanup(); - usb_hub_cleanup(); -diff --git a/include/linux/usb.h b/include/linux/usb.h -index 45bc7a5..a63c5ba 100644 ---- a/include/linux/usb.h -+++ b/include/linux/usb.h -@@ -351,10 +351,6 @@ struct usb_bus { - int bandwidth_int_reqs; /* number of Interrupt requests */ - int bandwidth_isoc_reqs; /* number of Isoc. requests */ - --#ifdef CONFIG_USB_DEVICEFS -- struct dentry *usbfs_dentry; /* usbfs dentry entry for the bus */ --#endif -- - #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) - struct mon_bus *mon_bus; /* non-null when associated */ - int monitored; /* non-zero when monitored */ -@@ -496,9 +492,6 @@ struct usb_device { - #ifdef CONFIG_USB_DEVICE_CLASS - struct device *usb_classdev; - #endif --#ifdef CONFIG_USB_DEVICEFS -- struct dentry *usbfs_dentry; --#endif - - int maxchild; - struct usb_device **children; -diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h -index 5de4157..159a08a 100644 ---- a/include/linux/usb/hcd.h -+++ b/include/linux/usb/hcd.h -@@ -582,29 +582,6 @@ static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd) - } - #endif /* CONFIG_USB_SUSPEND */ - -- --/* -- * USB device fs stuff -- */ -- --#ifdef CONFIG_USB_DEVICEFS -- --/* -- * these are expected to be called from the USB core/hub thread -- * with the kernel lock held -- */ --extern void usbfs_update_special(void); --extern int usbfs_init(void); --extern void usbfs_cleanup(void); -- --#else /* CONFIG_USB_DEVICEFS */ -- --static inline void usbfs_update_special(void) {} --static inline int usbfs_init(void) { return 0; } --static inline void usbfs_cleanup(void) { } -- --#endif /* CONFIG_USB_DEVICEFS */ -- - /*-------------------------------------------------------------------------*/ - - #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) diff --git a/usb-rename-the-usb-misc-class-from-usb-to-usbmisc.patch b/usb-rename-the-usb-misc-class-from-usb-to-usbmisc.patch index fbd4384d1b98a8..8c2340018fec5b 100644 --- a/usb-rename-the-usb-misc-class-from-usb-to-usbmisc.patch +++ b/usb-rename-the-usb-misc-class-from-usb-to-usbmisc.patch @@ -18,8 +18,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> drivers/usb/core/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c -index d95760d..8b63a51 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c @@ -92,7 +92,7 @@ static int init_usb_class(void) diff --git a/visor.patch b/visor.patch index b298073023b20e..b785f555c703ca 100644 --- a/visor.patch +++ b/visor.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { } /* Terminating entry */ }; -@@ -648,59 +643,7 @@ static int clie_5_attach(struct usb_seri +@@ -632,59 +627,7 @@ static int clie_5_attach(struct usb_seri return 0; } @@ -113,7 +113,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); -@@ -708,9 +651,3 @@ MODULE_LICENSE("GPL"); +@@ -692,9 +635,3 @@ MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); |