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>

29 files changed, 127 insertions, 127 deletions

diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index f8ce97d8b0ad..3b98fb733362 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -215,7 +215,7 @@ static void ark3116_release(struct usb_serial *serial)
 
 static void ark3116_init_termios(struct tty_struct *tty)
 {
-        struct ktermios *termios = tty->termios;
+        struct ktermios *termios = &tty->termios;
         *termios = tty_std_termios;
         termios->c_cflag = B9600 | CS8
                                       | CREAD | HUPCL | CLOCAL;
@@ -229,7 +229,7 @@ static void ark3116_set_termios(struct tty_struct *tty,
 {
         struct usb_serial *serial = port->serial;
         struct ark3116_private *priv = usb_get_serial_port_data(port);
-        struct ktermios *termios = tty->termios;
+        struct ktermios *termios = &tty->termios;
         unsigned int cflag = termios->c_cflag;
         int bps = tty_get_baud_rate(tty);
         int quot;
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 6b7365632951..a46df73ee96e 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -307,7 +307,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,
         unsigned long control_state;
         int bad_flow_control;
         speed_t baud;
-        struct ktermios *termios = tty->termios;
+        struct ktermios *termios = &tty->termios;
 
         iflag = termios->c_iflag;
         cflag = termios->c_cflag;
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 1e71079ce33b..ba5e07e188a0 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -469,7 +469,7 @@ static void cp210x_get_termios(struct tty_struct *tty,
 
         if (tty) {
                 cp210x_get_termios_port(tty->driver_data,
-                        &tty->termios->c_cflag, &baud);
+                        &tty->termios.c_cflag, &baud);
                 tty_encode_baud_rate(tty, baud, baud);
         }
 
@@ -631,7 +631,7 @@ static void cp210x_change_speed(struct tty_struct *tty,
 {
         u32 baud;
 
-        baud = tty->termios->c_ospeed;
+        baud = tty->termios.c_ospeed;
 
         /* This maps the requested rate to a rate valid on cp2102 or cp2103,
          * or to an arbitrary rate in [1M,2M].
@@ -665,10 +665,10 @@ static void cp210x_set_termios(struct tty_struct *tty,
         if (!tty)
                 return;
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
         old_cflag = old_termios->c_cflag;
 
-        if (tty->termios->c_ospeed != old_termios->c_ospeed)
+        if (tty->termios.c_ospeed != old_termios->c_ospeed)
                 cp210x_change_speed(tty, port, old_termios);
 
         /* If the number of data bits is to be updated */
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index b78c34eb5d3f..be34f153e566 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -922,38 +922,38 @@ static void cypress_set_termios(struct tty_struct *tty,
            early enough */
         if (!priv->termios_initialized) {
                 if (priv->chiptype == CT_EARTHMATE) {
-                        *(tty->termios) = tty_std_termios;
-                        tty->termios->c_cflag = B4800 | CS8 | CREAD | HUPCL |
+                        tty->termios = tty_std_termios;
+                        tty->termios.c_cflag = B4800 | CS8 | CREAD | HUPCL |
                                 CLOCAL;
-                        tty->termios->c_ispeed = 4800;
-                        tty->termios->c_ospeed = 4800;
+                        tty->termios.c_ispeed = 4800;
+                        tty->termios.c_ospeed = 4800;
                 } else if (priv->chiptype == CT_CYPHIDCOM) {
-                        *(tty->termios) = tty_std_termios;
-                        tty->termios->c_cflag = B9600 | CS8 | CREAD | HUPCL |
+                        tty->termios = tty_std_termios;
+                        tty->termios.c_cflag = B9600 | CS8 | CREAD | HUPCL |
                                 CLOCAL;
-                        tty->termios->c_ispeed = 9600;
-                        tty->termios->c_ospeed = 9600;
+                        tty->termios.c_ispeed = 9600;
+                        tty->termios.c_ospeed = 9600;
                 } else if (priv->chiptype == CT_CA42V2) {
-                        *(tty->termios) = tty_std_termios;
-                        tty->termios->c_cflag = B9600 | CS8 | CREAD | HUPCL |
+                        tty->termios = tty_std_termios;
+                        tty->termios.c_cflag = B9600 | CS8 | CREAD | HUPCL |
                                 CLOCAL;
-                        tty->termios->c_ispeed = 9600;
-                        tty->termios->c_ospeed = 9600;
+                        tty->termios.c_ispeed = 9600;
+                        tty->termios.c_ospeed = 9600;
                 }
                 priv->termios_initialized = 1;
         }
         spin_unlock_irqrestore(&priv->lock, flags);
 
         /* Unsupported features need clearing */
-        tty->termios->c_cflag &= ~(CMSPAR|CRTSCTS);
+        tty->termios.c_cflag &= ~(CMSPAR|CRTSCTS);
 
-        cflag = tty->termios->c_cflag;
-        iflag = tty->termios->c_iflag;
+        cflag = tty->termios.c_cflag;
+        iflag = tty->termios.c_iflag;
 
         /* check if there are new settings */
         if (old_termios) {
                 spin_lock_irqsave(&priv->lock, flags);
-                priv->tmp_termios = *(tty->termios);
+                priv->tmp_termios = tty->termios;
                 spin_unlock_irqrestore(&priv->lock, flags);
         }
 
@@ -1021,7 +1021,7 @@ static void cypress_set_termios(struct tty_struct *tty,
                                 "4800bps.");
                 /* define custom termios settings for NMEA protocol */
 
-                tty->termios->c_iflag /* input modes - */
+                tty->termios.c_iflag /* input modes - */
                         &= ~(IGNBRK  /* disable ignore break */
                         | BRKINT     /* disable break causes interrupt */
                         | PARMRK     /* disable mark parity errors */
@@ -1031,10 +1031,10 @@ static void cypress_set_termios(struct tty_struct *tty,
                         | ICRNL      /* disable translate CR to NL */
                         | IXON);     /* disable enable XON/XOFF flow control */
 
-                tty->termios->c_oflag /* output modes */
+                tty->termios.c_oflag /* output modes */
                         &= ~OPOST;    /* disable postprocess output char */
 
-                tty->termios->c_lflag /* line discipline modes */
+                tty->termios.c_lflag /* line discipline modes */
                         &= ~(ECHO     /* disable echo input characters */
                         | ECHONL      /* disable echo new line */
                         | ICANON      /* disable erase, kill, werase, and rprnt
@@ -1200,7 +1200,7 @@ static void cypress_read_int_callback(struct urb *urb)
 
         /* hangup, as defined in acm.c... this might be a bad place for it
          * though */
-        if (tty && !(tty->termios->c_cflag & CLOCAL) &&
+        if (tty && !(tty->termios.c_cflag & CLOCAL) &&
                         !(priv->current_status & UART_CD)) {
                 dbg("%s - calling hangup", __func__);
                 tty_hangup(tty);
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index b5cd838093ef..afd9d2ec577b 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -687,8 +687,8 @@ static void digi_set_termios(struct tty_struct *tty,
                 struct usb_serial_port *port, struct ktermios *old_termios)
 {
         struct digi_port *priv = usb_get_serial_port_data(port);
-        unsigned int iflag = tty->termios->c_iflag;
-        unsigned int cflag = tty->termios->c_cflag;
+        unsigned int iflag = tty->termios.c_iflag;
+        unsigned int cflag = tty->termios.c_cflag;
         unsigned int old_iflag = old_termios->c_iflag;
         unsigned int old_cflag = old_termios->c_cflag;
         unsigned char buf[32];
@@ -709,7 +709,7 @@ static void digi_set_termios(struct tty_struct *tty,
                         /* don't set RTS if using hardware flow control */
                         /* and throttling input */
                         modem_signals = TIOCM_DTR;
-                        if (!(tty->termios->c_cflag & CRTSCTS) ||
+                        if (!(tty->termios.c_cflag & CRTSCTS) ||
                             !test_bit(TTY_THROTTLED, &tty->flags))
                                 modem_signals |= TIOCM_RTS;
                         digi_set_modem_signals(port, modem_signals, 1);
@@ -748,7 +748,7 @@ static void digi_set_termios(struct tty_struct *tty,
                 }
         }
         /* set parity */
-        tty->termios->c_cflag &= ~CMSPAR;
+        tty->termios.c_cflag &= ~CMSPAR;
 
         if ((cflag&(PARENB|PARODD)) != (old_cflag&(PARENB|PARODD))) {
                 if (cflag&PARENB) {
@@ -1124,8 +1124,8 @@ static int digi_open(struct tty_struct *tty, struct usb_serial_port *port)
 
         /* set termios settings */
         if (tty) {
-                not_termios.c_cflag = ~tty->termios->c_cflag;
-                not_termios.c_iflag = ~tty->termios->c_iflag;
+                not_termios.c_cflag = ~tty->termios.c_cflag;
+                not_termios.c_iflag = ~tty->termios.c_iflag;
                 digi_set_termios(tty, port, &not_termios);
         }
         return 0;
@@ -1500,7 +1500,7 @@ static int digi_read_oob_callback(struct urb *urb)
 
                 rts = 0;
                 if (tty)
-                        rts = tty->termios->c_cflag & CRTSCTS;
+                        rts = tty->termios.c_cflag & CRTSCTS;
                 
                 if (tty && opcode == DIGI_CMD_READ_INPUT_SIGNALS) {
                         spin_lock(&priv->dp_port_lock);
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index cdf61dd07318..34e86383090a 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -87,7 +87,7 @@ static int empeg_startup(struct usb_serial *serial)
 
 static void empeg_init_termios(struct tty_struct *tty)
 {
-        struct ktermios *termios = tty->termios;
+        struct ktermios *termios = &tty->termios;
 
         /*
          * The empeg-car player wants these particular tty settings.
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 499b15fd82f1..42c604bc7ce4 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -173,7 +173,7 @@ static void f81232_set_termios(struct tty_struct *tty,
         /* FIXME - Stubbed out for now */
 
         /* Don't change anything if nothing has changed */
-        if (!tty_termios_hw_change(tty->termios, old_termios))
+        if (!tty_termios_hw_change(&tty->termios, old_termios))
                 return;
 
         /* Do the real work here... */
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index bc912e5a3beb..4b8b41a3351f 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2081,7 +2081,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
 {
         struct usb_device *dev = port->serial->dev;
         struct ftdi_private *priv = usb_get_serial_port_data(port);
-        struct ktermios *termios = tty->termios;
+        struct ktermios *termios = &tty->termios;
         unsigned int cflag = termios->c_cflag;
         __u16 urb_value; /* will hold the new flags */
 
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index e1f5ccd1e8f8..f435575c4e6e 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1458,7 +1458,7 @@ static void edge_throttle(struct tty_struct *tty)
         }
 
         /* if we are implementing RTS/CTS, toggle that line */
-        if (tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios.c_cflag & CRTSCTS) {
                 edge_port->shadowMCR &= ~MCR_RTS;
                 status = send_cmd_write_uart_register(edge_port, MCR,
                                                         edge_port->shadowMCR);
@@ -1497,7 +1497,7 @@ static void edge_unthrottle(struct tty_struct *tty)
                         return;
         }
         /* if we are implementing RTS/CTS, toggle that line */
-        if (tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios.c_cflag & CRTSCTS) {
                 edge_port->shadowMCR |= MCR_RTS;
                 send_cmd_write_uart_register(edge_port, MCR,
                                                 edge_port->shadowMCR);
@@ -1516,9 +1516,9 @@ static void edge_set_termios(struct tty_struct *tty,
         struct edgeport_port *edge_port = usb_get_serial_port_data(port);
         unsigned int cflag;
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
         dbg("%s - clfag %08x iflag %08x", __func__,
-            tty->termios->c_cflag, tty->termios->c_iflag);
+            tty->termios.c_cflag, tty->termios.c_iflag);
         dbg("%s - old clfag %08x old iflag %08x", __func__,
             old_termios->c_cflag, old_termios->c_iflag);
 
@@ -1987,7 +1987,7 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,
                 tty = tty_port_tty_get(&edge_port->port->port);
                 if (tty) {
                         change_port_settings(tty,
-                                edge_port, tty->termios);
+                                edge_port, &tty->termios);
                         tty_kref_put(tty);
                 }
 
@@ -2570,7 +2570,7 @@ static void change_port_settings(struct tty_struct *tty,
                 return;
         }
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
 
         switch (cflag & CSIZE) {
         case CS5:
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 3936904c6419..765978ae752e 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -1870,7 +1870,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
 
         /* set up the port settings */
         if (tty)
-                edge_set_termios(tty, port, tty->termios);
+                edge_set_termios(tty, port, &tty->termios);
 
         /* open up the port */
 
@@ -2272,13 +2272,13 @@ static void change_port_settings(struct tty_struct *tty,
 
         config = kmalloc (sizeof (*config), GFP_KERNEL);
         if (!config) {
-                *tty->termios = *old_termios;
+                tty->termios = *old_termios;
                 dev_err(&edge_port->port->dev, "%s - out of memory\n",
                                                                 __func__);
                 return;
         }
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
 
         config->wFlags = 0;
 
@@ -2362,7 +2362,7 @@ static void change_port_settings(struct tty_struct *tty,
         } else
                 dbg("%s - OUTBOUND XON/XOFF is disabled", __func__);
 
-        tty->termios->c_cflag &= ~CMSPAR;
+        tty->termios.c_cflag &= ~CMSPAR;
 
         /* Round the baud rate */
         baud = tty_get_baud_rate(tty);
@@ -2408,10 +2408,10 @@ static void edge_set_termios(struct tty_struct *tty,
         struct edgeport_port *edge_port = usb_get_serial_port_data(port);
         unsigned int cflag;
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
 
         dbg("%s - clfag %08x iflag %08x", __func__,
-            tty->termios->c_cflag, tty->termios->c_iflag);
+            tty->termios.c_cflag, tty->termios.c_iflag);
         dbg("%s - old clfag %08x old iflag %08x", __func__,
             old_termios->c_cflag, old_termios->c_iflag);
         dbg("%s - port %d", __func__, port->number);
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index fc09414c960f..5a96692b12a2 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -381,7 +381,7 @@ static void ir_set_termios(struct tty_struct *tty,
                 ir_xbof = ir_xbof_change(xbof) ;
 
         /* Only speed changes are supported */
-        tty_termios_copy_hw(tty->termios, old_termios);
+        tty_termios_copy_hw(&tty->termios, old_termios);
         tty_encode_baud_rate(tty, baud, baud);
 
         /*
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 22b1eb5040b7..bf3864045c18 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -921,7 +921,7 @@ static void iuu_set_termios(struct tty_struct *tty,
 {
         const u32 supported_mask = CMSPAR|PARENB|PARODD;
         struct iuu_private *priv = usb_get_serial_port_data(port);
-        unsigned int cflag = tty->termios->c_cflag;
+        unsigned int cflag = tty->termios.c_cflag;
         int status;
         u32 actual;
         u32 parity;
@@ -930,7 +930,7 @@ static void iuu_set_termios(struct tty_struct *tty,
         u32 newval = cflag & supported_mask;
 
         /* Just use the ospeed. ispeed should be the same. */
-        baud = tty->termios->c_ospeed;
+        baud = tty->termios.c_ospeed;
 
         dbg("%s - enter c_ospeed or baud=%d", __func__, baud);
 
@@ -961,13 +961,13 @@ static void iuu_set_termios(struct tty_struct *tty,
          * settings back over and then adjust them
          */
         if (old_termios)
-                tty_termios_copy_hw(tty->termios, old_termios);
+                tty_termios_copy_hw(&tty->termios, old_termios);
         if (status != 0)        /* Set failed - return old bits */
                 return;
         /* Re-encode speed, parity and csize */
         tty_encode_baud_rate(tty, baud, baud);
-        tty->termios->c_cflag &= ~(supported_mask|CSIZE);
-        tty->termios->c_cflag |= newval | csize;
+        tty->termios.c_cflag &= ~(supported_mask|CSIZE);
+        tty->termios.c_cflag |= newval | csize;
 }
 
 static void iuu_close(struct usb_serial_port *port)
@@ -993,14 +993,14 @@ static void iuu_close(struct usb_serial_port *port)
 
 static void iuu_init_termios(struct tty_struct *tty)
 {
-        *(tty->termios) = tty_std_termios;
-        tty->termios->c_cflag = CLOCAL | CREAD | CS8 | B9600
+        tty->termios = tty_std_termios;
+        tty->termios.c_cflag = CLOCAL | CREAD | CS8 | B9600
                                 | TIOCM_CTS | CSTOPB | PARENB;
-        tty->termios->c_ispeed = 9600;
-        tty->termios->c_ospeed = 9600;
-        tty->termios->c_lflag = 0;
-        tty->termios->c_oflag = 0;
-        tty->termios->c_iflag = 0;
+        tty->termios.c_ispeed = 9600;
+        tty->termios.c_ospeed = 9600;
+        tty->termios.c_lflag = 0;
+        tty->termios.c_oflag = 0;
+        tty->termios.c_iflag = 0;
 }
 
 static int iuu_open(struct tty_struct *tty, struct usb_serial_port *port)
@@ -1012,8 +1012,8 @@ static int iuu_open(struct tty_struct *tty, struct usb_serial_port *port)
         u32 actual;
         struct iuu_private *priv = usb_get_serial_port_data(port);
 
-        baud = tty->termios->c_ospeed;
-        tty->termios->c_ispeed = baud;
+        baud = tty->termios.c_ospeed;
+        tty->termios.c_ispeed = baud;
         /* Re-encode speed */
         tty_encode_baud_rate(tty, baud, baud);
 
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index a1b99243dac9..6225199119c0 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -158,7 +158,7 @@ static void keyspan_set_termios(struct tty_struct *tty,
 
         p_priv = usb_get_serial_port_data(port);
         d_details = p_priv->device_details;
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
         device_port = port->number - port->serial->minor;
 
         /* Baud rate calculation takes baud rate as an integer
@@ -179,7 +179,7 @@ static void keyspan_set_termios(struct tty_struct *tty,
         p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;
 
         /* Mark/Space not supported */
-        tty->termios->c_cflag &= ~CMSPAR;
+        tty->termios.c_cflag &= ~CMSPAR;
 
         keyspan_send_setup(port, 0);
 }
@@ -1089,7 +1089,7 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
 
         device_port = port->number - port->serial->minor;
         if (tty) {
-                cflag = tty->termios->c_cflag;
+                cflag = tty->termios.c_cflag;
                 /* Baud rate calculation takes baud rate as an integer
                    so other rates can be generated if desired. */
                 baud_rate = tty_get_baud_rate(tty);
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index a4ac3cfeffc4..dcada8615fcf 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -338,7 +338,7 @@ static void keyspan_pda_set_termios(struct tty_struct *tty,
            7[EOMS]1: 10 bit, b0/b7 is parity
            7[EOMS]2: 11 bit, b0/b7 is parity, extra bit always (mark?)
 
-           HW flow control is dictated by the tty->termios->c_cflags & CRTSCTS
+           HW flow control is dictated by the tty->termios.c_cflags & CRTSCTS
            bit.
 
            For now, just do baud. */
@@ -353,7 +353,7 @@ static void keyspan_pda_set_termios(struct tty_struct *tty,
         }
         /* Only speed can change so copy the old h/w parameters
            then encode the new speed */
-        tty_termios_copy_hw(tty->termios, old_termios);
+        tty_termios_copy_hw(&tty->termios, old_termios);
         tty_encode_baud_rate(tty, speed, speed);
 }
 
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 5bed59cd5776..def9ad258715 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -311,12 +311,12 @@ static int  klsi_105_open(struct tty_struct *tty, struct usb_serial_port *port)
 
         /* set up termios structure */
         spin_lock_irqsave(&priv->lock, flags);
-        priv->termios.c_iflag = tty->termios->c_iflag;
-        priv->termios.c_oflag = tty->termios->c_oflag;
-        priv->termios.c_cflag = tty->termios->c_cflag;
-        priv->termios.c_lflag = tty->termios->c_lflag;
+        priv->termios.c_iflag = tty->termios.c_iflag;
+        priv->termios.c_oflag = tty->termios.c_oflag;
+        priv->termios.c_cflag = tty->termios.c_cflag;
+        priv->termios.c_lflag = tty->termios.c_lflag;
         for (i = 0; i < NCCS; i++)
-                priv->termios.c_cc[i] = tty->termios->c_cc[i];
+                priv->termios.c_cc[i] = tty->termios.c_cc[i];
         priv->cfg.pktlen   = cfg->pktlen;
         priv->cfg.baudrate = cfg->baudrate;
         priv->cfg.databits = cfg->databits;
@@ -445,9 +445,9 @@ static void klsi_105_set_termios(struct tty_struct *tty,
                                  struct ktermios *old_termios)
 {
         struct klsi_105_private *priv = usb_get_serial_port_data(port);
-        unsigned int iflag = tty->termios->c_iflag;
+        unsigned int iflag = tty->termios.c_iflag;
         unsigned int old_iflag = old_termios->c_iflag;
-        unsigned int cflag = tty->termios->c_cflag;
+        unsigned int cflag = tty->termios.c_cflag;
         unsigned int old_cflag = old_termios->c_cflag;
         struct klsi_105_port_settings *cfg;
         unsigned long flags;
@@ -560,7 +560,7 @@ static void klsi_105_set_termios(struct tty_struct *tty,
         if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))
             || (cflag & CSTOPB) != (old_cflag & CSTOPB)) {
                 /* Not currently supported */
-                tty->termios->c_cflag &= ~(PARENB|PARODD|CSTOPB);
+                tty->termios.c_cflag &= ~(PARENB|PARODD|CSTOPB);
 #if 0
                 priv->last_lcr = 0;
 
@@ -587,7 +587,7 @@ static void klsi_105_set_termios(struct tty_struct *tty,
             || (iflag & IXON) != (old_iflag & IXON)
             ||  (cflag & CRTSCTS) != (old_cflag & CRTSCTS)) {
                 /* Not currently supported */
-                tty->termios->c_cflag &= ~CRTSCTS;
+                tty->termios.c_cflag &= ~CRTSCTS;
                 /* Drop DTR/RTS if no flow control otherwise assert */
 #if 0
                 if ((iflag & IXOFF) || (iflag & IXON) || (cflag & CRTSCTS))
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index fafeabb64c55..0516a9661e2f 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -191,11 +191,11 @@ static void kobil_release(struct usb_serial *serial)
 static void kobil_init_termios(struct tty_struct *tty)
 {
         /* Default to echo off and other sane device settings */
-        tty->termios->c_lflag = 0;
-        tty->termios->c_lflag &= ~(ISIG | ICANON | ECHO | IEXTEN | XCASE);
-        tty->termios->c_iflag = IGNBRK | IGNPAR | IXOFF;
+        tty->termios.c_lflag = 0;
+        tty->termios.c_lflag &= ~(ISIG | ICANON | ECHO | IEXTEN | XCASE);
+        tty->termios.c_lflag = IGNBRK | IGNPAR | IXOFF;
         /* do NOT translate CR to CR-NL (0x0A -> 0x0A 0x0D) */
-        tty->termios->c_oflag &= ~ONLCR;
+        tty->termios.c_oflag &= ~ONLCR;
 }
 
 static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port)
@@ -581,14 +581,14 @@ static void kobil_set_termios(struct tty_struct *tty,
         struct kobil_private *priv;
         int result;
         unsigned short urb_val = 0;
-        int c_cflag = tty->termios->c_cflag;
+        int c_cflag = tty->termios.c_cflag;
         speed_t speed;
 
         priv = usb_get_serial_port_data(port);
         if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID ||
                         priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
                 /* This device doesn't support ioctl calls */
-                *tty->termios = *old;
+                tty->termios = *old;
                 return;
         }
 
@@ -612,7 +612,7 @@ static void kobil_set_termios(struct tty_struct *tty,
                         urb_val |= SUSBCR_SPASB_EvenParity;
         } else
                 urb_val |= SUSBCR_SPASB_NoParity;
-        tty->termios->c_cflag &= ~CMSPAR;
+        tty->termios.c_cflag &= ~CMSPAR;
         tty_encode_baud_rate(tty, speed, speed);
 
         result = usb_control_msg(port->serial->dev,
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index a71fa0aa0406..df98cffdba65 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -454,7 +454,7 @@ static int  mct_u232_open(struct tty_struct *tty, struct usb_serial_port *port)
          * either.
          */
         spin_lock_irqsave(&priv->lock, flags);
-        if (tty && (tty->termios->c_cflag & CBAUD))
+        if (tty && (tty->termios.c_cflag & CBAUD))
                 priv->control_state = TIOCM_DTR | TIOCM_RTS;
         else
                 priv->control_state = 0;
@@ -634,7 +634,7 @@ static void mct_u232_set_termios(struct tty_struct *tty,
 {
         struct usb_serial *serial = port->serial;
         struct mct_u232_private *priv = usb_get_serial_port_data(port);
-        struct ktermios *termios = tty->termios;
+        struct ktermios *termios = &tty->termios;
         unsigned int cflag = termios->c_cflag;
         unsigned int old_cflag = old_termios->c_cflag;
         unsigned long flags;
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index a07dd3c8cfef..012f67b2e4cc 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1349,7 +1349,7 @@ static void mos7720_throttle(struct tty_struct *tty)
         }
 
         /* if we are implementing RTS/CTS, toggle that line */
-        if (tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios.c_cflag & CRTSCTS) {
                 mos7720_port->shadowMCR &= ~UART_MCR_RTS;
                 write_mos_reg(port->serial, port->number - port->serial->minor,
                               MCR, mos7720_port->shadowMCR);
@@ -1383,7 +1383,7 @@ static void mos7720_unthrottle(struct tty_struct *tty)
         }
 
         /* if we are implementing RTS/CTS, toggle that line */
-        if (tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios.c_cflag & CRTSCTS) {
                 mos7720_port->shadowMCR |= UART_MCR_RTS;
                 write_mos_reg(port->serial, port->number - port->serial->minor,
                               MCR, mos7720_port->shadowMCR);
@@ -1604,8 +1604,8 @@ static void change_port_settings(struct tty_struct *tty,
         lStop = 0x00;   /* 1 stop bit */
         lParity = 0x00; /* No parity */
 
-        cflag = tty->termios->c_cflag;
-        iflag = tty->termios->c_iflag;
+        cflag = tty->termios.c_cflag;
+        iflag = tty->termios.c_iflag;
 
         /* Change the number of bits */
         switch (cflag & CSIZE) {
@@ -1753,11 +1753,11 @@ static void mos7720_set_termios(struct tty_struct *tty,
 
         dbg("%s\n", "setting termios - ASPIRE");
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
 
         dbg("%s - cflag %08x iflag %08x", __func__,
-            tty->termios->c_cflag,
-            RELEVANT_IFLAG(tty->termios->c_iflag));
+            tty->termios.c_cflag,
+            RELEVANT_IFLAG(tty->termios.c_iflag));
 
         dbg("%s - old cflag %08x old iflag %08x", __func__,
             old_termios->c_cflag,
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 57eca2448424..d2f2b5d65732 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1649,7 +1649,7 @@ static void mos7840_throttle(struct tty_struct *tty)
                         return;
         }
         /* if we are implementing RTS/CTS, toggle that line */
-        if (tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios.c_cflag & CRTSCTS) {
                 mos7840_port->shadowMCR &= ~MCR_RTS;
                 status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER,
                                          mos7840_port->shadowMCR);
@@ -1692,7 +1692,7 @@ static void mos7840_unthrottle(struct tty_struct *tty)
         }
 
         /* if we are implementing RTS/CTS, toggle that line */
-        if (tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios.c_cflag & CRTSCTS) {
                 mos7840_port->shadowMCR |= MCR_RTS;
                 status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER,
                                          mos7840_port->shadowMCR);
@@ -1998,8 +1998,8 @@ static void mos7840_change_port_settings(struct tty_struct *tty,
         lStop = LCR_STOP_1;
         lParity = LCR_PAR_NONE;
 
-        cflag = tty->termios->c_cflag;
-        iflag = tty->termios->c_iflag;
+        cflag = tty->termios.c_cflag;
+        iflag = tty->termios.c_iflag;
 
         /* Change the number of bits */
         if (cflag & CSIZE) {
@@ -2159,10 +2159,10 @@ static void mos7840_set_termios(struct tty_struct *tty,
 
         dbg("%s", "setting termios - ");
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
 
         dbg("%s - clfag %08x iflag %08x", __func__,
-            tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag));
+            tty->termios.c_cflag, RELEVANT_IFLAG(tty->termios.c_iflag));
         dbg("%s - old clfag %08x old iflag %08x", __func__,
             old_termios->c_cflag, RELEVANT_IFLAG(old_termios->c_iflag));
         dbg("%s - port %d", __func__, port->number);
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 5976b65ab6ee..9f555560bfbf 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -404,10 +404,10 @@ static int oti6858_chars_in_buffer(struct tty_struct *tty)
 
 static void oti6858_init_termios(struct tty_struct *tty)
 {
-        *(tty->termios) = tty_std_termios;
-        tty->termios->c_cflag = B38400 | CS8 | CREAD | HUPCL | CLOCAL;
-        tty->termios->c_ispeed = 38400;
-        tty->termios->c_ospeed = 38400;
+        tty->termios = tty_std_termios;
+        tty->termios.c_cflag = B38400 | CS8 | CREAD | HUPCL | CLOCAL;
+        tty->termios.c_ispeed = 38400;
+        tty->termios.c_ospeed = 38400;
 }
 
 static void oti6858_set_termios(struct tty_struct *tty,
@@ -425,7 +425,7 @@ static void oti6858_set_termios(struct tty_struct *tty,
                 return;
         }
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
 
         spin_lock_irqsave(&priv->lock, flags);
         divisor = priv->pending_setup.divisor;
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 13b8dd6481f5..2b9108a8ea64 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -260,16 +260,16 @@ static void pl2303_set_termios(struct tty_struct *tty,
            serial settings even to the same values as before. Thus
            we actually need to filter in this specific case */
 
-        if (!tty_termios_hw_change(tty->termios, old_termios))
+        if (!tty_termios_hw_change(&tty->termios, old_termios))
                 return;
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
 
         buf = kzalloc(7, GFP_KERNEL);
         if (!buf) {
                 dev_err(&port->dev, "%s - out of memory.\n", __func__);
                 /* Report back no change occurred */
-                *tty->termios = *old_termios;
+                tty->termios = *old_termios;
                 return;
         }
 
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c
index 8dd88ebe9863..7de6d491a859 100644
--- a/drivers/usb/serial/quatech2.c
+++ b/drivers/usb/serial/quatech2.c
@@ -275,7 +275,7 @@ static void qt2_set_termios(struct tty_struct *tty,
 {
         struct usb_device *dev = port->serial->dev;
         struct qt2_port_private *port_priv;
-        struct ktermios *termios = tty->termios;
+        struct ktermios *termios = &tty->termios;
         u16 baud;
         unsigned int cflag = termios->c_cflag;
         u16 new_lcr = 0;
@@ -408,7 +408,7 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
         port_priv->device_port = (u8) device_port;
 
         if (tty)
-                qt2_set_termios(tty, port, tty->termios);
+                qt2_set_termios(tty, port, &tty->termios);
 
         return 0;
 
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index d423d36acc04..a4e4f3a16c63 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -385,7 +385,7 @@ static int sierra_send_setup(struct usb_serial_port *port)
 static void sierra_set_termios(struct tty_struct *tty,
                 struct usb_serial_port *port, struct ktermios *old_termios)
 {
-        tty_termios_copy_hw(tty->termios, old_termios);
+        tty_termios_copy_hw(&tty->termios, old_termios);
         sierra_send_setup(port);
 }
 
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index cad608984710..ab68a4d74d61 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -316,10 +316,10 @@ static void spcp8x5_dtr_rts(struct usb_serial_port *port, int on)
 static void spcp8x5_init_termios(struct tty_struct *tty)
 {
         /* for the 1st time call this function */
-        *(tty->termios) = tty_std_termios;
-        tty->termios->c_cflag = B115200 | CS8 | CREAD | HUPCL | CLOCAL;
-        tty->termios->c_ispeed = 115200;
-        tty->termios->c_ospeed = 115200;
+        tty->termios = tty_std_termios;
+        tty->termios.c_cflag = B115200 | CS8 | CREAD | HUPCL | CLOCAL;
+        tty->termios.c_ispeed = 115200;
+        tty->termios.c_ospeed = 115200;
 }
 
 /* set the serial param for transfer. we should check if we really need to
@@ -330,7 +330,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
         struct usb_serial *serial = port->serial;
         struct spcp8x5_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
-        unsigned int cflag = tty->termios->c_cflag;
+        unsigned int cflag = tty->termios.c_cflag;
         unsigned int old_cflag = old_termios->c_cflag;
         unsigned short uartdata;
         unsigned char buf[2] = {0, 0};
@@ -340,7 +340,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
 
 
         /* check that they really want us to change something */
-        if (!tty_termios_hw_change(tty->termios, old_termios))
+        if (!tty_termios_hw_change(&tty->termios, old_termios))
                 return;
 
         /* set DTR/RTS active */
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index 3fee23bf0c14..cf2d30cf7588 100644
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -216,7 +216,7 @@ static void ssu100_set_termios(struct tty_struct *tty,
                                struct ktermios *old_termios)
 {
         struct usb_device *dev = port->serial->dev;
-        struct ktermios *termios = tty->termios;
+        struct ktermios *termios = &tty->termios;
         u16 baud, divisor, remainder;
         unsigned int cflag = termios->c_cflag;
         u16 urb_value = 0; /* will hold the new flags */
@@ -322,7 +322,7 @@ static int ssu100_open(struct tty_struct *tty, struct usb_serial_port *port)
                 dbg("%s - set uart failed", __func__);
 
         if (tty)
-                ssu100_set_termios(tty, port, tty->termios);
+                ssu100_set_termios(tty, port, &tty->termios);
 
         return usb_serial_generic_open(tty, port);
 }
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index a4404f5ad68e..f502a16aac21 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -520,7 +520,7 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
         }
 
         if (tty)
-                ti_set_termios(tty, port, tty->termios);
+                ti_set_termios(tty, port, &tty->termios);
 
         dbg("%s - sending TI_OPEN_PORT", __func__);
         status = ti_command_out_sync(tdev, TI_OPEN_PORT,
@@ -562,7 +562,7 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
         usb_clear_halt(dev, port->read_urb->pipe);
 
         if (tty)
-                ti_set_termios(tty, port, tty->termios);
+                ti_set_termios(tty, port, &tty->termios);
 
         dbg("%s - sending TI_OPEN_PORT (2)", __func__);
         status = ti_command_out_sync(tdev, TI_OPEN_PORT,
@@ -831,8 +831,8 @@ static void ti_set_termios(struct tty_struct *tty,
         int port_number = port->number - port->serial->minor;
         unsigned int mcr;
 
-        cflag = tty->termios->c_cflag;
-        iflag = tty->termios->c_iflag;
+        cflag = tty->termios.c_cflag;
+        iflag = tty->termios.c_iflag;
 
         dbg("%s - cflag %08x, iflag %08x", __func__, cflag, iflag);
         dbg("%s - old clfag %08x, old iflag %08x", __func__,
@@ -871,7 +871,7 @@ static void ti_set_termios(struct tty_struct *tty,
         }
 
         /* CMSPAR isn't supported by this driver */
-        tty->termios->c_cflag &= ~CMSPAR;
+        tty->termios.c_cflag &= ~CMSPAR;
 
         if (cflag & PARENB) {
                 if (cflag & PARODD) {
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index da67abb1945e..5fe21357b55c 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -423,7 +423,7 @@ static void serial_set_termios(struct tty_struct *tty, struct ktermios *old)
         if (port->serial->type->set_termios)
                 port->serial->type->set_termios(tty, port, old);
         else
-                tty_termios_copy_hw(tty->termios, old);
+                tty_termios_copy_hw(&tty->termios, old);
 }
 
 static int serial_break(struct tty_struct *tty, int break_state)
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index f35971dff4a5..7c3db9e6f324 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -67,7 +67,7 @@ void usb_wwan_set_termios(struct tty_struct *tty,
         struct usb_wwan_intf_private *intfdata = port->serial->private;
 
         /* Doesn't support option setting */
-        tty_termios_copy_hw(tty->termios, old_termios);
+        tty_termios_copy_hw(&tty->termios, old_termios);
 
         if (intfdata->send_setup)
                 intfdata->send_setup(port);
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 473635e7f5db..b36077de72b9 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -724,7 +724,7 @@ static void firm_setup_port(struct tty_struct *tty)
 {
         struct usb_serial_port *port = tty->driver_data;
         struct whiteheat_port_settings port_settings;
-        unsigned int cflag = tty->termios->c_cflag;
+        unsigned int cflag = tty->termios.c_cflag;
 
         port_settings.port = port->number + 1;