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>

2 files changed, 3 insertions, 9 deletions

diff --git a/include/linux/tty.h b/include/linux/tty.h
index d5e75ee0f4d1..a39e72325e78 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -423,7 +423,6 @@ extern void tty_unthrottle(struct tty_struct *tty);
 extern int tty_do_resize(struct tty_struct *tty, struct winsize *ws);
 extern void tty_driver_remove_tty(struct tty_driver *driver,
                                   struct tty_struct *tty);
-extern void tty_shutdown(struct tty_struct *tty);
 extern void tty_free_termios(struct tty_struct *tty);
 extern int is_current_pgrp_orphaned(void);
 extern struct pid *tty_get_pgrp(struct tty_struct *tty);
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 04419c141b00..80e72dc564a5 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -45,14 +45,9 @@
  *
  * void (*shutdown)(struct tty_struct * tty);
  *
- *      This routine is called synchronously when a particular tty device
- *      is closed for the last time freeing up the resources.
- *      Note that tty_shutdown() is not called if ops->shutdown is defined.
- *      This means one is responsible to take care of calling ops->remove (e.g.
- *      via tty_driver_remove_tty) and releasing tty->termios.
- *      Note that this hook may be called from *all* the contexts where one
- *      uses tty refcounting (e.g. tty_port_tty_get).
- *
+ *      This routine is called under the tty lock when a particular tty device
+ *      is closed for the last time. It executes before the tty resources
+ *      are freed so may execute while another function holds a tty kref.
  *
  * void (*cleanup)(struct tty_struct * tty);
  *