From 50f097eb7739cae452034fe906fb3095fa08b885 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 4 May 2012 16:17:49 -0700 Subject: [PATCH] --- yaml --- r: 303775 b: refs/heads/master c: 2af588d5f093fd8212bfe7151183a535e8e9117b h: refs/heads/master i: 303773: 2c7281978f818d6502bebab5da3c39041797fb49 303771: b8f3d14806cf8544b739c85a27ed1c7685d728ee 303767: c5a744d5c8c357ebe49adba524980a2d5234cf1a 303759: 4ff96406bb63e075d913d501dbcf0e2ef3ef407c 303743: b3af4a4f3a123c887022215c2b55b5278e13b9af v: v3 --- [refs] | 2 +- .../staging/quatech_usb2/quatech_usb2.c | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index c61a2f3353b7..eff054c9c78c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7275fc4c16ef50e99d3755265a4ae83e3afe63d0 +refs/heads/master: 2af588d5f093fd8212bfe7151183a535e8e9117b diff --git a/trunk/drivers/staging/quatech_usb2/quatech_usb2.c b/trunk/drivers/staging/quatech_usb2/quatech_usb2.c index 679b249b11cb..7739ada045e6 100644 --- a/trunk/drivers/staging/quatech_usb2/quatech_usb2.c +++ b/trunk/drivers/staging/quatech_usb2/quatech_usb2.c @@ -415,8 +415,6 @@ static void qt2_release(struct usb_serial *serial) struct quatech2_port *qt_port; int i; - dbg("enterting %s", __func__); - for (i = 0; i < serial->num_ports; i++) { port = serial->port[i]; if (!port) @@ -455,8 +453,6 @@ int qt2_open(struct tty_struct *tty, struct usb_serial_port *port) if (port_paranoia_check(port, __func__)) return -ENODEV; - dbg("%s(): port %d", __func__, port->number); - serial = port->serial; /* get the parent device structure */ if (serial_paranoia_check(serial, __func__)) { dbg("usb_serial struct failed sanity check"); @@ -636,7 +632,6 @@ static void qt2_close(struct usb_serial_port *port) __u8 lsr_value = 0; /* value of Line Status Register */ int status; /* result of last USB comms function */ - dbg("%s(): port %d", __func__, port->number); serial = port->serial; /* get the parent device structure */ dev_extra = qt2_get_dev_private(serial); /* get the device private data */ @@ -971,10 +966,7 @@ static void qt2_set_termios(struct tty_struct *tty, int status; __u16 UartNumber; - dbg("%s(): port %d", __func__, port->number); - serial = port->serial; - UartNumber = port->number; if (old_termios && !tty_termios_hw_change(old_termios, tty->termios)) @@ -1096,9 +1088,7 @@ static int qt2_tiocmget(struct tty_struct *tty) if (serial == NULL) return -ENODEV; - dbg("%s(): port %d, tty =0x%p", __func__, port->number, tty); UartNumber = tty->index - serial->minor; - dbg("UartNumber is %d", UartNumber); status = qt2_box_get_register(port->serial, UartNumber, QT2_MODEM_CONTROL_REGISTER, &mcr_value); @@ -1138,7 +1128,6 @@ static int qt2_tiocmset(struct tty_struct *tty, return -ENODEV; UartNumber = tty->index - serial->minor; - dbg("%s(): port %d, UartNumber %d", __func__, port->number, UartNumber); status = qt2_box_get_register(port->serial, UartNumber, QT2_MODEM_CONTROL_REGISTER, &mcr_value); @@ -1198,7 +1187,6 @@ static void qt2_break(struct tty_struct *tty, int break_state) port->number, NULL, 0, 300); exit: mutex_unlock(&port_extra->modelock); - dbg("%s(): exit port %d", __func__, port->number); } /** @@ -1209,7 +1197,6 @@ static void qt2_throttle(struct tty_struct *tty) struct usb_serial_port *port = tty->driver_data; struct usb_serial *serial = port->serial; struct quatech2_port *port_extra; /* extra data for this port */ - dbg("%s(): port %d", __func__, port->number); port_extra = qt2_get_port_private(port); if (!serial) { @@ -1255,7 +1242,6 @@ static void qt2_unthrottle(struct tty_struct *tty) port->number); return; } - dbg("%s(): enter port %d", __func__, port->number); dev_extra = qt2_get_dev_private(serial); port_extra = qt2_get_port_private(port); port0 = serial->port[0]; /* get the first port's device structure */ @@ -1285,7 +1271,6 @@ static void qt2_unthrottle(struct tty_struct *tty) } exit: mutex_unlock(&port_extra->modelock); - dbg("%s(): exit port %d", __func__, port->number); return; } @@ -1682,7 +1667,6 @@ __func__); /* cribbed from serqt_usb2 driver, but not sure which work needs * scheduling - port0 or currently active port? */ /* schedule_work(&port->work); */ - dbg("%s() completed", __func__); return; } @@ -1696,7 +1680,7 @@ static void qt2_write_bulk_callback(struct urb *urb) { struct usb_serial_port *port = (struct usb_serial_port *)urb->context; struct usb_serial *serial = port->serial; - dbg("%s(): port %d", __func__, port->number); + if (!serial) { dbg("%s(): bad serial pointer, exiting", __func__); return; @@ -1711,7 +1695,6 @@ static void qt2_write_bulk_callback(struct urb *urb) */ /*port_softint((void *) serial); commented in vendor driver */ schedule_work(&port->work); - dbg("%s(): port %d exit", __func__, port->number); return; }