tty: Move the handling of the tty release logic
Now that we don't have tty->termios tied to drivers->tty we can untangle the logic here. In addition we can push the removal logic out of the destructor path. At that point we can think about sorting out tty_port and console and all the other ugly hangovers. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
3db1ddb725
commit
36b3c070d2
@@ -527,12 +527,6 @@ static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver,
|
||||
return tty;
|
||||
}
|
||||
|
||||
static void pty_unix98_shutdown(struct tty_struct *tty)
|
||||
{
|
||||
tty_driver_remove_tty(tty->driver, tty);
|
||||
/* We have our own method as we don't use the tty index */
|
||||
}
|
||||
|
||||
/* We have no need to install and remove our tty objects as devpts does all
|
||||
the work for us */
|
||||
|
||||
@@ -558,9 +552,8 @@ static const struct tty_operations ptm_unix98_ops = {
|
||||
.unthrottle = pty_unthrottle,
|
||||
.set_termios = pty_set_termios,
|
||||
.ioctl = pty_unix98_ioctl,
|
||||
.shutdown = pty_unix98_shutdown,
|
||||
.cleanup = pty_cleanup,
|
||||
.resize = pty_resize
|
||||
.resize = pty_resize,
|
||||
.cleanup = pty_cleanup
|
||||
};
|
||||
|
||||
static const struct tty_operations pty_unix98_ops = {
|
||||
@@ -575,7 +568,6 @@ static const struct tty_operations pty_unix98_ops = {
|
||||
.chars_in_buffer = pty_chars_in_buffer,
|
||||
.unthrottle = pty_unthrottle,
|
||||
.set_termios = pty_set_termios,
|
||||
.shutdown = pty_unix98_shutdown,
|
||||
.cleanup = pty_cleanup,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user