Commit e4408ce3 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman

TTY: quatech2, remove unneeded is_open

tty->ops->break_ctl cannot be called outside the gap between open and
close. So there is no need to check whether the port is open in
break_ctl in quatech2. Remove the check and also that member
completely.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6aad04f2
...@@ -116,7 +116,6 @@ struct qt2_serial_private { ...@@ -116,7 +116,6 @@ struct qt2_serial_private {
}; };
struct qt2_port_private { struct qt2_port_private {
bool is_open;
u8 device_port; u8 device_port;
spinlock_t urb_lock; spinlock_t urb_lock;
...@@ -398,7 +397,6 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -398,7 +397,6 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
return status; return status;
} }
port_priv->is_open = true;
port_priv->device_port = (u8) device_port; port_priv->device_port = (u8) device_port;
if (tty) if (tty)
...@@ -418,8 +416,6 @@ static void qt2_close(struct usb_serial_port *port) ...@@ -418,8 +416,6 @@ static void qt2_close(struct usb_serial_port *port)
serial = port->serial; serial = port->serial;
port_priv = usb_get_serial_port_data(port); port_priv = usb_get_serial_port_data(port);
port_priv->is_open = false;
spin_lock_irqsave(&port_priv->urb_lock, flags); spin_lock_irqsave(&port_priv->urb_lock, flags);
usb_kill_urb(port_priv->write_urb); usb_kill_urb(port_priv->write_urb);
port_priv->urb_in_use = false; port_priv->urb_in_use = false;
...@@ -905,12 +901,6 @@ static void qt2_break_ctl(struct tty_struct *tty, int break_state) ...@@ -905,12 +901,6 @@ static void qt2_break_ctl(struct tty_struct *tty, int break_state)
port_priv = usb_get_serial_port_data(port); port_priv = usb_get_serial_port_data(port);
if (!port_priv->is_open) {
dev_err(&port->dev,
"%s - port is not open\n", __func__);
return;
}
val = (break_state == -1) ? 1 : 0; val = (break_state == -1) ? 1 : 0;
status = qt2_control_msg(port->serial->dev, QT2_BREAK_CONTROL, status = qt2_control_msg(port->serial->dev, QT2_BREAK_CONTROL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment