korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 08:44:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

tty: Fix various bogus WARN checks in the usb serial layer

Browse Source 
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>
This commit is contained in:
Alan Cox 2010-02-08 10:10:04 +00:00 committed by Greg Kroah-Hartman
parent bd07c551aa
commit 49d3380e3f
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/serial/usb-serial.c
View File

@ -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); 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 */ /* pass on to the driver specific version of this function */
retval = port->serial->type->write(tty, port, buf, count); retval = port->serial->type->write(tty, port, buf, count);
@ -373,7 +369,6 @@ static int serial_write_room(struct tty_struct *tty)
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function */ /* pass on to the driver specific version of this function */
return port->serial->type->write_room(tty); return port->serial->type->write_room(tty);
} }
@ -396,7 +391,6 @@ static void serial_throttle(struct tty_struct *tty)
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function */ /* pass on to the driver specific version of this function */
if (port->serial->type->throttle) if (port->serial->type->throttle)
port->serial->type->throttle(tty); port->serial->type->throttle(tty);
@ -407,7 +401,6 @@ static void serial_unthrottle(struct tty_struct *tty)
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function */ /* pass on to the driver specific version of this function */
if (port->serial->type->unthrottle) if (port->serial->type->unthrottle)
port->serial->type->unthrottle(tty); port->serial->type->unthrottle(tty);
@ -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); 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 /* pass on to the driver specific version of this function
if it is available */ if it is available */
if (port->serial->type->ioctl) { if (port->serial->type->ioctl) {
@ -437,7 +428,6 @@ static void serial_set_termios(struct tty_struct *tty, struct ktermios *old)
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function /* pass on to the driver specific version of this function
if it is available */ if it is available */
if (port->serial->type->set_termios) if (port->serial->type->set_termios)
@ -452,7 +442,6 @@ static int serial_break(struct tty_struct *tty, int break_state)
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
WARN_ON(!port->port.count);
/* pass on to the driver specific version of this function /* pass on to the driver specific version of this function
if it is available */ if it is available */
if (port->serial->type->break_ctl) if (port->serial->type->break_ctl)
@ -513,7 +502,6 @@ static int serial_tiocmget(struct tty_struct *tty, struct file *file)
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
WARN_ON(!port->port.count);
if (port->serial->type->tiocmget) if (port->serial->type->tiocmget)
return port->serial->type->tiocmget(tty, file); return port->serial->type->tiocmget(tty, file);
return -EINVAL; return -EINVAL;
@ -526,7 +514,6 @@ static int serial_tiocmset(struct tty_struct *tty, struct file *file,
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
WARN_ON(!port->port.count);
if (port->serial->type->tiocmset) if (port->serial->type->tiocmset)
return port->serial->type->tiocmset(tty, file, set, clear); return port->serial->type->tiocmset(tty, file, set, clear);
return -EINVAL; return -EINVAL;