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

TTY: simserial, use tty_port_close_end

The code is identical except locking. But added locks to protect
counts do not hurt here. Rather the contrary.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2fcd5caf
...@@ -478,13 +478,8 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -478,13 +478,8 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
rs_flush_buffer(tty); rs_flush_buffer(tty);
tty_ldisc_flush(tty); tty_ldisc_flush(tty);
port->tty = NULL; port->tty = NULL;
if (port->blocked_open) {
if (port->close_delay) tty_port_close_end(port, tty);
schedule_timeout_interruptible(port->close_delay);
wake_up_interruptible(&port->open_wait);
}
port->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
wake_up_interruptible(&port->close_wait);
} }
/* /*
...@@ -706,6 +701,9 @@ static const struct tty_operations hp_ops = { ...@@ -706,6 +701,9 @@ static const struct tty_operations hp_ops = {
.proc_fops = &rs_proc_fops, .proc_fops = &rs_proc_fops,
}; };
static const struct tty_port_operations hp_port_ops = {
};
/* /*
* The serial driver boot-time initialization code! * The serial driver boot-time initialization code!
*/ */
...@@ -742,6 +740,7 @@ static int __init simrs_init(void) ...@@ -742,6 +740,7 @@ static int __init simrs_init(void)
*/ */
state = rs_table; state = rs_table;
tty_port_init(&state->port); tty_port_init(&state->port);
state->port.ops = &hp_port_ops;
state->port.close_delay = 0; /* XXX really 0? */ state->port.close_delay = 0; /* XXX really 0? */
retval = hpsim_get_irq(KEYBOARD_INTR); retval = hpsim_get_irq(KEYBOARD_INTR);
......
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