tty: move the termios object into the tty

This will let us sort out a whole pile of tty related races. The
alternative would be to keep points and refcount the termios objects.
However
1. They are tiny anyway
2. Many devices don't use the stored copies
3. We can remove a pty special case

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index e1235accab74..d593a7d18ad5 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -702,7 +702,7 @@ static void isicom_config_port(struct tty_struct *tty)
 
                 /* 1,2,3,4 => 57.6, 115.2, 230, 460 kbps resp. */
                 if (baud < 1 || baud > 4)
-                        tty->termios->c_cflag &= ~CBAUDEX;
+                        tty->termios.c_cflag &= ~CBAUDEX;
                 else
                         baud += 15;
         }
@@ -1196,8 +1196,8 @@ static void isicom_set_termios(struct tty_struct *tty,
         if (isicom_paranoia_check(port, tty->name, "isicom_set_termios"))
                 return;
 
-        if (tty->termios->c_cflag == old_termios->c_cflag &&
-                        tty->termios->c_iflag == old_termios->c_iflag)
+        if (tty->termios.c_cflag == old_termios->c_cflag &&
+                        tty->termios.c_iflag == old_termios->c_iflag)
                 return;
 
         spin_lock_irqsave(&port->card->card_lock, flags);
@@ -1205,7 +1205,7 @@ static void isicom_set_termios(struct tty_struct *tty,
         spin_unlock_irqrestore(&port->card->card_lock, flags);
 
         if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios->c_cflag & CRTSCTS)) {
+                        !(tty->termios.c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 isicom_start(tty);
         }