Skip to content

Commit

Permalink
tty: Fix various bogus WARN checks in the usb serial layer
Browse files Browse the repository at this point in the history
We are now refcounted and all the port.count checking is no longer valid
and in fact produces false warnings.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Mar 2, 2010
1 parent bd07c55 commit 49d3380
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,6 @@ static int serial_write(struct tty_struct *tty, const unsigned char *buf,

dbg("%s - port %d, %d byte(s)", __func__, port->number, count);

/* count is managed under the mutex lock for the tty so cannot
drop to zero until after the last close completes */
WARN_ON(!port->port.count);

/* pass on to the driver specific version of this function */
retval = port->serial->type->write(tty, port, buf, count);

Expand All @@ -373,7 +369,6 @@ static int serial_write_room(struct tty_struct *tty)
{
struct usb_serial_port *port = tty->driver_data;
dbg("%s - port %d", __func__, port->number);
WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function */
return port->serial->type->write_room(tty);
}
Expand All @@ -396,7 +391,6 @@ static void serial_throttle(struct tty_struct *tty)
struct usb_serial_port *port = tty->driver_data;
dbg("%s - port %d", __func__, port->number);

WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function */
if (port->serial->type->throttle)
port->serial->type->throttle(tty);
Expand All @@ -407,7 +401,6 @@ static void serial_unthrottle(struct tty_struct *tty)
struct usb_serial_port *port = tty->driver_data;
dbg("%s - port %d", __func__, port->number);

WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function */
if (port->serial->type->unthrottle)
port->serial->type->unthrottle(tty);
Expand All @@ -421,8 +414,6 @@ static int serial_ioctl(struct tty_struct *tty, struct file *file,

dbg("%s - port %d, cmd 0x%.4x", __func__, port->number, cmd);

WARN_ON(!port->port.count);

/* pass on to the driver specific version of this function
if it is available */
if (port->serial->type->ioctl) {
Expand All @@ -437,7 +428,6 @@ static void serial_set_termios(struct tty_struct *tty, struct ktermios *old)
struct usb_serial_port *port = tty->driver_data;
dbg("%s - port %d", __func__, port->number);

WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function
if it is available */
if (port->serial->type->set_termios)
Expand All @@ -452,7 +442,6 @@ static int serial_break(struct tty_struct *tty, int break_state)

dbg("%s - port %d", __func__, port->number);

WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function
if it is available */
if (port->serial->type->break_ctl)
Expand Down Expand Up @@ -513,7 +502,6 @@ static int serial_tiocmget(struct tty_struct *tty, struct file *file)

dbg("%s - port %d", __func__, port->number);

WARN_ON(!port->port.count);
if (port->serial->type->tiocmget)
return port->serial->type->tiocmget(tty, file);
return -EINVAL;
Expand All @@ -526,7 +514,6 @@ static int serial_tiocmset(struct tty_struct *tty, struct file *file,

dbg("%s - port %d", __func__, port->number);

WARN_ON(!port->port.count);
if (port->serial->type->tiocmset)
return port->serial->type->tiocmset(tty, file, set, clear);
return -EINVAL;
Expand Down

0 comments on commit 49d3380

Please sign in to comment.