Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303743
b: refs/heads/master
c: b69919c
h: refs/heads/master
i:
  303741: 21d959e
  303739: d1df578
  303735: 16a36b5
  303727: 12e5dad
  303711: 955bda0
  303679: ce25866
  303615: 4002188
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent 458ed4b commit b3af4a4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f65ee14fa83e0753472905a10091b07bfe3cccf2
refs/heads/master: b69919ca246fdfb6e6fec05c8e6d86c57a238ce4
17 changes: 0 additions & 17 deletions trunk/drivers/usb/serial/mct_u232.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,6 @@ static void mct_u232_release(struct usb_serial *serial)
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]);
Expand All @@ -446,8 +444,6 @@ static int mct_u232_open(struct tty_struct *tty, struct usb_serial_port *port)
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
Expand Down Expand Up @@ -528,8 +524,6 @@ static void mct_u232_dtr_rts(struct usb_serial_port *port, int on)

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);
Expand Down Expand Up @@ -572,7 +566,6 @@ static void mct_u232_read_int_callback(struct urb *urb)
return;
}

dbg("%s - port %d", __func__, port->number);
usb_serial_debug_data(debug, &port->dev, __func__,
urb->actual_length, data);

Expand Down Expand Up @@ -733,8 +726,6 @@ static void mct_u232_break_ctl(struct tty_struct *tty, int break_state)
unsigned char lcr;
unsigned long flags;

dbg("%sstate=%d", __func__, break_state);

spin_lock_irqsave(&priv->lock, flags);
lcr = priv->last_lcr;

Expand All @@ -753,8 +744,6 @@ static int mct_u232_tiocmget(struct tty_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);
Expand All @@ -771,8 +760,6 @@ static int mct_u232_tiocmset(struct tty_struct *tty,
unsigned int control_state;
unsigned long flags;

dbg("%s", __func__);

spin_lock_irqsave(&priv->lock, flags);
control_state = priv->control_state;

Expand All @@ -796,8 +783,6 @@ static void mct_u232_throttle(struct tty_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)) {
Expand All @@ -816,8 +801,6 @@ static void mct_u232_unthrottle(struct tty_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);
if ((priv->rx_flags & THROTTLED) && C_CRTSCTS(tty)) {
priv->rx_flags &= ~THROTTLED;
Expand Down

0 comments on commit b3af4a4

Please sign in to comment.