TTY: switch tty_insert_flip_char

Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty in many
call sites. Only tty_port will needed and hence no more
tty_port_tty_get in those paths.

tty_insert_flip_char is the next one to proceed. This one is used all
over the code, so the patch is huge.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

33 files changed, 147 insertions, 132 deletions

diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index f99a84526f82..3719273cf0be 100644
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@ -305,7 +305,7 @@ static void receive_chars(struct m68k_serial *info, struct tty_struct *tty,
                 else if (rx & URX_FRAME_ERROR)
                         flag = TTY_FRAME;
 
-                tty_insert_flip_char(tty, ch, flag);
+                tty_insert_flip_char(&info->tport, ch, flag);
 #ifndef CONFIG_XCOPILOT_BUGS
         } while((rx = uart->urx.w) & URX_DATA_READY);
 #endif
diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
index 505c490c0b44..6ca5dd615f9e 100644
--- a/drivers/tty/serial/ar933x_uart.c
+++ b/drivers/tty/serial/ar933x_uart.c
@@ -297,10 +297,11 @@ static void ar933x_uart_set_termios(struct uart_port *port,
 
 static void ar933x_uart_rx_chars(struct ar933x_uart_port *up)
 {
+        struct tty_port *port = &up->port.state->port;
         struct tty_struct *tty;
         int max_count = 256;
 
-        tty = tty_port_tty_get(&up->port.state->port);
+        tty = tty_port_tty_get(port);
         do {
                 unsigned int rdata;
                 unsigned char ch;
@@ -313,11 +314,6 @@ static void ar933x_uart_rx_chars(struct ar933x_uart_port *up)
                 ar933x_uart_write(up, AR933X_UART_DATA_REG,
                                   AR933X_UART_DATA_RX_CSR);
 
-                if (!tty) {
-                        /* discard the data if no tty available */
-                        continue;
-                }
-
                 up->port.icount.rx++;
                 ch = rdata & AR933X_UART_DATA_TX_RX_MASK;
 
@@ -325,7 +321,7 @@ static void ar933x_uart_rx_chars(struct ar933x_uart_port *up)
                         continue;
 
                 if ((up->port.ignore_status_mask & AR933X_DUMMY_STATUS_RD) == 0)
-                        tty_insert_flip_char(tty, ch, TTY_NORMAL);
+                        tty_insert_flip_char(port, ch, TTY_NORMAL);
         } while (max_count-- > 0);
 
         if (tty) {
diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c
index c76a226080f2..de30b1909728 100644
--- a/drivers/tty/serial/bcm63xx_uart.c
+++ b/drivers/tty/serial/bcm63xx_uart.c
@@ -235,6 +235,7 @@ static const char *bcm_uart_type(struct uart_port *port)
  */
 static void bcm_uart_do_rx(struct uart_port *port)
 {
+        struct tty_port *port = &port->state->port;
         struct tty_struct *tty;
         unsigned int max_count;
 
@@ -242,7 +243,7 @@ static void bcm_uart_do_rx(struct uart_port *port)
          * higher than fifo size anyway since we're much faster than
          * serial port */
         max_count = 32;
-        tty = port->state->port.tty;
+        tty = port->tty;
         do {
                 unsigned int iestat, c, cstat;
                 char flag;
@@ -261,7 +262,7 @@ static void bcm_uart_do_rx(struct uart_port *port)
                         bcm_uart_writel(port, val, UART_CTL_REG);
 
                         port->icount.overrun++;
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(port, 0, TTY_OVERRUN);
                 }
 
                 if (!(iestat & UART_IR_STAT(UART_IR_RXNOTEMPTY)))
@@ -300,7 +301,7 @@ static void bcm_uart_do_rx(struct uart_port *port)
 
 
                 if ((cstat & port->ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty, c, flag);
+                        tty_insert_flip_char(port, c, flag);
 
         } while (--max_count);
 
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index f5d117379b60..e4d3ac2e8992 100644
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -149,7 +149,8 @@ static int sport_uart_setup(struct sport_uart_port *up, int size, int baud_rate)
 static irqreturn_t sport_uart_rx_irq(int irq, void *dev_id)
 {
         struct sport_uart_port *up = dev_id;
-        struct tty_struct *tty = up->port.state->port.tty;
+        struct tty_port *port = &up->port.state->port;
+        struct tty_struct *tty = tport->tty;
         unsigned int ch;
 
         spin_lock(&up->port.lock);
@@ -159,7 +160,7 @@ static irqreturn_t sport_uart_rx_irq(int irq, void *dev_id)
                 up->port.icount.rx++;
 
                 if (!uart_handle_sysrq_char(&up->port, ch))
-                        tty_insert_flip_char(tty, ch, TTY_NORMAL);
+                        tty_insert_flip_char(port, ch, TTY_NORMAL);
         }
         tty_flip_buffer_push(tty);
 
@@ -182,7 +183,6 @@ static irqreturn_t sport_uart_tx_irq(int irq, void *dev_id)
 static irqreturn_t sport_uart_err_irq(int irq, void *dev_id)
 {
         struct sport_uart_port *up = dev_id;
-        struct tty_struct *tty = up->port.state->port.tty;
         unsigned int stat = SPORT_GET_STAT(up);
 
         spin_lock(&up->port.lock);
@@ -190,7 +190,7 @@ static irqreturn_t sport_uart_err_irq(int irq, void *dev_id)
         /* Overflow in RX FIFO */
         if (stat & ROVF) {
                 up->port.icount.overrun++;
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(&up->port.state->port, 0, TTY_OVERRUN);
                 SPORT_PUT_STAT(up, ROVF); /* Clear ROVF bit */
         }
         /* These should not happen */
@@ -205,6 +205,8 @@ static irqreturn_t sport_uart_err_irq(int irq, void *dev_id)
         SSYNC();
 
         spin_unlock(&up->port.lock);
+        /* XXX we don't push the overrun bit to TTY? */
+
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index 42d5eb0125b3..108122f8f3c2 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -303,7 +303,7 @@ static void cpm_uart_int_rx(struct uart_port *port)
                         }
 #endif
                       error_return:
-                        tty_insert_flip_char(tty, ch, flg);
+                        tty_insert_flip_char(tport, ch, flg);
 
                 }               /* End while (i--) */
 
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 35ee6a2c6877..d12306625458 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -1760,8 +1760,7 @@ add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char fl
 
                 info->icount.rx++;
         } else {
-                struct tty_struct *tty = info->port.tty;
-                tty_insert_flip_char(tty, data, flag);
+                tty_insert_flip_char(&info->port, data, flag);
                 info->icount.rx++;
         }
 
@@ -2338,8 +2337,7 @@ more_data:
                                         data_in, data_read);
                                 char flag = TTY_NORMAL;
                                 if (info->errorcode == ERRCODE_INSERT_BREAK) {
-                                        struct tty_struct *tty = info->port.tty;
-                                        tty_insert_flip_char(tty, 0, flag);
+                                        tty_insert_flip_char(&info->port, 0, flag);
                                         info->icount.rx++;
                                 }
 
@@ -2353,7 +2351,7 @@ more_data:
                                         info->icount.frame++;
                                         flag = TTY_FRAME;
                                 }
-                                tty_insert_flip_char(tty, data, flag);
+                                tty_insert_flip_char(&info->port, data, flag);
                                 info->errorcode = 0;
                         }
                         info->break_detected_cnt = 0;
@@ -2369,7 +2367,7 @@ more_data:
                         log_int(rdpc(), 0, 0);
                 }
                 );
-                tty_insert_flip_char(tty,
+                tty_insert_flip_char(&info->port,
                         IO_EXTRACT(R_SERIAL0_READ, data_in, data_read),
                         TTY_NORMAL);
         } else {
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
index a8cbb2670521..bdf67b0cb8b6 100644
--- a/drivers/tty/serial/efm32-uart.c
+++ b/drivers/tty/serial/efm32-uart.c
@@ -194,8 +194,7 @@ static void efm32_uart_break_ctl(struct uart_port *port, int ctl)
         /* not possible without fiddling with gpios */
 }
 
-static void efm32_uart_rx_chars(struct efm32_uart_port *efm_port,
-                struct tty_struct *tty)
+static void efm32_uart_rx_chars(struct efm32_uart_port *efm_port)
 {
         struct uart_port *port = &efm_port->port;
 
@@ -237,8 +236,8 @@ static void efm32_uart_rx_chars(struct efm32_uart_port *efm_port,
                                         rxdata & UARTn_RXDATAX_RXDATA__MASK))
                         continue;
 
-                if (tty && (rxdata & port->ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty,
+                if ((rxdata & port->ignore_status_mask) == 0)
+                        tty_insert_flip_char(&port->state->port,
                                         rxdata & UARTn_RXDATAX_RXDATA__MASK, flag);
         }
 }
@@ -249,15 +248,16 @@ static irqreturn_t efm32_uart_rxirq(int irq, void *data)
         u32 irqflag = efm32_uart_read32(efm_port, UARTn_IF);
         int handled = IRQ_NONE;
         struct uart_port *port = &efm_port->port;
+        struct tty_port *tport = &port->state->port;
         struct tty_struct *tty;
 
         spin_lock(&port->lock);
 
-        tty = tty_kref_get(port->state->port.tty);
+        tty = tty_kref_get(tport->tty);
 
         if (irqflag & UARTn_IF_RXDATAV) {
                 efm32_uart_write32(efm_port, UARTn_IF_RXDATAV, UARTn_IFC);
-                efm32_uart_rx_chars(efm_port, tty);
+                efm32_uart_rx_chars(efm_port);
 
                 handled = IRQ_HANDLED;
         }
@@ -265,8 +265,7 @@ static irqreturn_t efm32_uart_rxirq(int irq, void *data)
         if (irqflag & UARTn_IF_RXOF) {
                 efm32_uart_write32(efm_port, UARTn_IF_RXOF, UARTn_IFC);
                 port->icount.overrun++;
-                if (tty)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
 
                 handled = IRQ_HANDLED;
         }
diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index 72b6334bcf1a..2b0b60ff7f01 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -734,7 +734,8 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 {
         short int count, rcv_buff;
-        struct tty_struct *tty = icom_port->uart_port.state->port.tty;
+        struct tty_port *port = &icom_port->uart_port.state->port;
+        struct tty_struct *tty = port->tty;
         unsigned short int status;
         struct uart_icount *icount;
         unsigned long offset;
@@ -812,7 +813,7 @@ static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 
                 }
 
-                tty_insert_flip_char(tty, *(icom_port->recv_buf + offset + count - 1), flag);
+                tty_insert_flip_char(port, *(icom_port->recv_buf + offset + count - 1), flag);
 
                 if (status & SA_FLAGS_OVERRUN)
                         /*
@@ -820,7 +821,7 @@ static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
                          * reported immediately, and doesn't
                          * affect the current character
                          */
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(port, 0, TTY_OVERRUN);
 ignore_char:
                 icom_port->statStg->rcv[rcv_buff].flags = 0;
                 icom_port->statStg->rcv[rcv_buff].leLength = 0;
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 1a2488495f69..f60c4028b6e1 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -517,6 +517,8 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
         struct imx_port *sport = dev_id;
         unsigned int rx, flg, ignored = 0;
         struct tty_struct *tty = sport->port.state->port.tty;
+        struct tty_port *port = &sport->port.state->port;
+        struct tty_struct *tty = port->tty;
         unsigned long flags, temp;
 
         spin_lock_irqsave(&sport->port.lock, flags);
@@ -569,7 +571,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
 #endif
                 }
 
-                tty_insert_flip_char(tty, rx, flg);
+                tty_insert_flip_char(port, rx, flg);
         }
 
 out:
diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c
index 3969e54744cc..ac1d36cb2032 100644
--- a/drivers/tty/serial/jsm/jsm_tty.c
+++ b/drivers/tty/serial/jsm/jsm_tty.c
@@ -631,13 +631,13 @@ void jsm_input(struct jsm_channel *ch)
                                  * format it likes.
                                  */
                                 if (*(ch->ch_equeue +tail +i) & UART_LSR_BI)
-                                        tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i),  TTY_BREAK);
+                                        tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i),  TTY_BREAK);
                                 else if (*(ch->ch_equeue +tail +i) & UART_LSR_PE)
-                                        tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_PARITY);
+                                        tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i), TTY_PARITY);
                                 else if (*(ch->ch_equeue +tail +i) & UART_LSR_FE)
-                                        tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_FRAME);
+                                        tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i), TTY_FRAME);
                                 else
-                                        tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_NORMAL);
+                                        tty_insert_flip_char(port, *(ch->ch_rqueue +tail +i), TTY_NORMAL);
                         }
                 } else {
                         tty_insert_flip_string(tp, ch->ch_rqueue + tail, s) ;
diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
index 6ac2b797a764..ba2ef627d9c6 100644
--- a/drivers/tty/serial/kgdb_nmi.c
+++ b/drivers/tty/serial/kgdb_nmi.c
@@ -216,7 +216,7 @@ static void kgdb_nmi_tty_receiver(unsigned long data)
                 return;
 
         while (kfifo_out(&priv->fifo, &ch, 1))
-                tty_insert_flip_char(priv->port.tty, ch, TTY_NORMAL);
+                tty_insert_flip_char(&priv->port, ch, TTY_NORMAL);
         tty_flip_buffer_push(priv->port.tty);
 
         tty_kref_put(tty);
diff --git a/drivers/tty/serial/lantiq.c b/drivers/tty/serial/lantiq.c
index 02da071fe1e7..1933fe3c98dd 100644
--- a/drivers/tty/serial/lantiq.c
+++ b/drivers/tty/serial/lantiq.c
@@ -162,7 +162,8 @@ lqasc_enable_ms(struct uart_port *port)
 static int
 lqasc_rx_chars(struct uart_port *port)
 {
-        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tty_port_tty_get(tport);
         unsigned int ch = 0, rsr = 0, fifocnt;
 
         if (!tty) {
@@ -208,7 +209,7 @@ lqasc_rx_chars(struct uart_port *port)
                 }
 
                 if ((rsr & port->ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty, ch, flag);
+                        tty_insert_flip_char(tport, ch, flag);
 
                 if (rsr & ASCSTATE_ROE)
                         /*
@@ -216,7 +217,7 @@ lqasc_rx_chars(struct uart_port *port)
                          * immediately, and doesn't affect the current
                          * character
                          */
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(tport, 0, TTY_OVERRUN);
         }
         if (ch != 0)
                 tty_flip_buffer_push(tty);
diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index 0e86bff3fe2a..5cd180564c03 100644
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -257,8 +257,9 @@ static void __serial_uart_flush(struct uart_port *port)
 
 static void __serial_lpc32xx_rx(struct uart_port *port)
 {
+        struct tty_port *tport = &port->state->port;
         unsigned int tmp, flag;
-        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
+        struct tty_struct *tty = tty_port_tty_get(tport);
 
         if (!tty) {
                 /* Discard data: no tty available */
@@ -281,10 +282,10 @@ static void __serial_lpc32xx_rx(struct uart_port *port)
                                LPC32XX_HSUART_IIR(port->membase));
                         port->icount.frame++;
                         flag = TTY_FRAME;
-                        tty_insert_flip_char(tty, 0, TTY_FRAME);
+                        tty_insert_flip_char(tport, 0, TTY_FRAME);
                 }
 
-                tty_insert_flip_char(tty, (tmp & 0xFF), flag);
+                tty_insert_flip_char(tport, (tmp & 0xFF), flag);
 
                 tmp = readl(LPC32XX_HSUART_FIFO(port->membase));
         }
@@ -332,7 +333,8 @@ exit_tx:
 static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id)
 {
         struct uart_port *port = dev_id;
-        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
+        struct tty_port *port = &port->state->port;
+        struct tty_struct *tty = tty_port_tty_get(tport);
         u32 status;
 
         spin_lock(&port->lock);
@@ -356,8 +358,8 @@ static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id)
                 writel(LPC32XX_HSU_RX_OE_INT,
                        LPC32XX_HSUART_IIR(port->membase));
                 port->icount.overrun++;
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
                 if (tty) {
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
                         tty_schedule_flip(tty);
                 }
         }
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index b13949ad3408..2e9a390f2ac4 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -300,7 +300,8 @@ static void m32r_sio_enable_ms(struct uart_port *port)
 
 static void receive_chars(struct uart_sio_port *up, int *status)
 {
-        struct tty_struct *tty = up->port.state->port.tty;
+        struct tty_port *port = &up->port.state->port;
+        struct tty_struct *tty = tport->tty;
         unsigned char ch;
         unsigned char flag;
         int max_count = 256;
@@ -355,7 +356,7 @@ static void receive_chars(struct uart_sio_port *up, int *status)
                 if (uart_handle_sysrq_char(&up->port, ch))
                         goto ignore_char;
                 if ((*status & up->port.ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty, ch, flag);
+                        tty_insert_flip_char(port, ch, flag);
 
                 if (*status & UART_LSR_OE) {
                         /*
@@ -363,7 +364,7 @@ static void receive_chars(struct uart_sio_port *up, int *status)
                          * immediately, and doesn't affect the current
                          * character.
                          */
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(port, 0, TTY_OVERRUN);
                 }
         ignore_char:
                 *status = serial_in(up, UART_LSR);
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 7c23c4f4c58d..0145aeb7721c 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -941,7 +941,8 @@ static struct uart_ops mpc52xx_uart_ops = {
 static inline int
 mpc52xx_uart_int_rx_chars(struct uart_port *port)
 {
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tport->tty;
         unsigned char ch, flag;
         unsigned short status;
 
@@ -986,14 +987,14 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port)
                         out_8(&PSC(port)->command, MPC52xx_PSC_RST_ERR_STAT);
 
                 }
-                tty_insert_flip_char(tty, ch, flag);
+                tty_insert_flip_char(tport, ch, flag);
                 if (status & MPC52xx_PSC_SR_OE) {
                         /*
                          * Overrun is special, since it's
                          * reported immediately, and doesn't
                          * affect the current character
                          */
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(tport, 0, TTY_OVERRUN);
                         port->icount.overrun++;
                 }
         }
diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c
index 50366863cfa3..4bcbc66c48c4 100644
--- a/drivers/tty/serial/mpsc.c
+++ b/drivers/tty/serial/mpsc.c
@@ -1040,10 +1040,10 @@ static int mpsc_rx_intr(struct mpsc_port_info *pi)
                                                 | SDMA_DESC_CMDSTAT_FR
                                                 | SDMA_DESC_CMDSTAT_OR)))
                                 && !(cmdstat & pi->port.ignore_status_mask)) {
-                        tty_insert_flip_char(tty, *bp, flag);
+                        tty_insert_flip_char(port, *bp, flag);
                 } else {
                         for (i=0; i<bytes_in; i++)
-                                tty_insert_flip_char(tty, *bp++, TTY_NORMAL);
+                                tty_insert_flip_char(port, *bp++, TTY_NORMAL);
 
                         pi->port.icount.rx += bytes_in;
                 }
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 95fd39be2934..e4eb81a12793 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -91,14 +91,15 @@ static void msm_enable_ms(struct uart_port *port)
 
 static void handle_rx_dm(struct uart_port *port, unsigned int misr)
 {
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tport->tty;
         unsigned int sr;
         int count = 0;
         struct msm_port *msm_port = UART_TO_MSM(port);
 
         if ((msm_read(port, UART_SR) & UART_SR_OVERRUN)) {
                 port->icount.overrun++;
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
                 msm_write(port, UART_CR_CMD_RESET_ERR, UART_CR);
         }
 
@@ -146,7 +147,8 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr)
 
 static void handle_rx(struct uart_port *port)
 {
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tport->tty;
         unsigned int sr;
 
         /*
@@ -155,7 +157,7 @@ static void handle_rx(struct uart_port *port)
          */
         if ((msm_read(port, UART_SR) & UART_SR_OVERRUN)) {
                 port->icount.overrun++;
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
                 msm_write(port, UART_CR_CMD_RESET_ERR, UART_CR);
         }
 
@@ -186,7 +188,7 @@ static void handle_rx(struct uart_port *port)
                 }
 
                 if (!uart_handle_sysrq_char(port, c))
-                        tty_insert_flip_char(tty, c, flag);
+                        tty_insert_flip_char(tport, c, flag);
         }
 
         tty_flip_buffer_push(tty);
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 1fa92284ade0..6aa9d470ef54 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -908,6 +908,7 @@ static void msm_hs_dmov_rx_callback(struct msm_dmov_cmd *cmd_ptr,
         unsigned long flags;
         unsigned int flush;
         struct tty_struct *tty;
+        struct tty_port *port;
         struct uart_port *uport;
         struct msm_hs_port *msm_uport;
 
@@ -917,7 +918,8 @@ static void msm_hs_dmov_rx_callback(struct msm_dmov_cmd *cmd_ptr,
         spin_lock_irqsave(&uport->lock, flags);
         clk_enable(msm_uport->clk);
 
-        tty = uport->state->port.tty;
+        port = &uport->state->port;
+        tty = port->tty;
 
         msm_hs_write(uport, UARTDM_CR_ADDR, STALE_EVENT_DISABLE);
 
@@ -926,7 +928,7 @@ static void msm_hs_dmov_rx_callback(struct msm_dmov_cmd *cmd_ptr,
         /* overflow is not connect to data in a FIFO */
         if (unlikely((status & UARTDM_SR_OVERRUN_BMSK) &&
                      (uport->read_status_mask & CREAD))) {
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(port, 0, TTY_OVERRUN);
                 uport->icount.buf_overrun++;
                 error_f = 1;
         }
@@ -939,7 +941,7 @@ static void msm_hs_dmov_rx_callback(struct msm_dmov_cmd *cmd_ptr,
                 uport->icount.parity++;
                 error_f = 1;
                 if (uport->ignore_status_mask & IGNPAR)
-                        tty_insert_flip_char(tty, 0, TTY_PARITY);
+                        tty_insert_flip_char(port, 0, TTY_PARITY);
         }
 
         if (error_f)
@@ -1344,7 +1346,6 @@ static irqreturn_t msm_hs_rx_wakeup_isr(int irq, void *dev)
         unsigned long flags;
         struct msm_hs_port *msm_uport = dev;
         struct uart_port *uport = &msm_uport->uport;
-        struct tty_struct *tty = NULL;
 
         spin_lock_irqsave(&uport->lock, flags);
         if (msm_uport->clk_state == MSM_HS_CLK_OFF) {
@@ -1361,8 +1362,7 @@ static irqreturn_t msm_hs_rx_wakeup_isr(int irq, void *dev)
                  * optionally inject char into tty rx */
                 msm_hs_request_clock_on_locked(uport);
                 if (msm_uport->rx_wakeup.inject_rx) {
-                        tty = uport->state->port.tty;
-                        tty_insert_flip_char(tty,
+                        tty_insert_flip_char(&uport->state->port,
                                              msm_uport->rx_wakeup.rx_to_inject,
                                              TTY_NORMAL);
                         queue_work(msm_hs_workqueue, &msm_uport->rx.tty_work);
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index e2775b6df5a5..83b21686020e 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -242,8 +242,9 @@ static void mux_write(struct uart_port *port)
  */
 static void mux_read(struct uart_port *port)
 {
+        struct tty_port *tport = &port->state->port;
         int data;
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_struct *tty = tport->tty;
         __u32 start_count = port->icount.rx;
 
         while(1) {
@@ -266,7 +267,7 @@ static void mux_read(struct uart_port *port)
                 if (uart_handle_sysrq_char(port, data & 0xffu))
                         continue;
 
-                tty_insert_flip_char(tty, data & 0xFF, TTY_NORMAL);
+                tty_insert_flip_char(tport, data & 0xFF, TTY_NORMAL);
         }
         
         if (start_count != port->icount.rx) {
diff --git a/drivers/tty/serial/nwpserial.c b/drivers/tty/serial/nwpserial.c
index dd4c31d1aee5..10d64a3697fb 100644
--- a/drivers/tty/serial/nwpserial.c
+++ b/drivers/tty/serial/nwpserial.c
@@ -128,7 +128,8 @@ static void nwpserial_config_port(struct uart_port *port, int flags)
 static irqreturn_t nwpserial_interrupt(int irq, void *dev_id)
 {
         struct nwpserial_port *up = dev_id;
-        struct tty_struct *tty = up->port.state->port.tty;
+        struct tty_port *port = &up->port.state->port;
+        struct tty_struct *tty = port->tty;
         irqreturn_t ret;
         unsigned int iir;
         unsigned char ch;
@@ -146,7 +147,7 @@ static irqreturn_t nwpserial_interrupt(int irq, void *dev_id)
                 up->port.icount.rx++;
                 ch = dcr_read(up->dcr_host, UART_RX);
                 if (up->port.ignore_status_mask != NWPSERIAL_STATUS_RXVALID)
-                        tty_insert_flip_char(tty, ch, TTY_NORMAL);
+                        tty_insert_flip_char(port, ch, TTY_NORMAL);
         } while (dcr_read(up->dcr_host, UART_LSR) & UART_LSR_DR);
 
         tty_flip_buffer_push(tty);
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 333c8d012b0e..73a3f295e7c4 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -229,6 +229,7 @@ static void pmz_interrupt_control(struct uart_pmac_port *uap, int enable)
 
 static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
 {
+        struct tty_port *port;
         struct tty_struct *tty = NULL;
         unsigned char ch, r1, drop, error, flag;
         int loops = 0;
@@ -239,7 +240,8 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
                 (void)read_zsdata(uap);
                 return NULL;
         }
-        tty = uap->port.state->port.tty;
+        port = &uap->port.state->port;
+        tty = port->tty; /* TOCTOU above */
 
         while (1) {
                 error = 0;
@@ -309,10 +311,10 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
 
                 if (uap->port.ignore_status_mask == 0xff ||
                     (r1 & uap->port.ignore_status_mask) == 0) {
-                        tty_insert_flip_char(tty, ch, flag);
+                        tty_insert_flip_char(port, ch, flag);
                 }
                 if (r1 & Rx_OVR)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(port, 0, TTY_OVERRUN);
         next_char:
                 /* We can get stuck in an infinite loop getting char 0 when the
                  * line is in a wrong HW state, we break that here.
diff --git a/drivers/tty/serial/sc26xx.c b/drivers/tty/serial/sc26xx.c
index aced1dd923d8..0cd0e4ac12a6 100644
--- a/drivers/tty/serial/sc26xx.c
+++ b/drivers/tty/serial/sc26xx.c
@@ -138,14 +138,18 @@ static void sc26xx_disable_irq(struct uart_port *port, int mask)
 
 static struct tty_struct *receive_chars(struct uart_port *port)
 {
+        struct tty_port *tport = NULL;
         struct tty_struct *tty = NULL;
         int limit = 10000;
         unsigned char ch;
         char flag;
         u8 status;
 
-        if (port->state != NULL)                /* Unopened serial console */
-                tty = port->state->port.tty;
+        /* FIXME what is this trying to achieve? */
+        if (port->state != NULL) {              /* Unopened serial console */
+                tport = &port->state->port;
+                tty = tport->tty;
+        }
 
         while (limit-- > 0) {
                 status = READ_SC_PORT(port, SR);
@@ -185,7 +189,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
                 if (status & port->ignore_status_mask)
                         continue;
 
-                tty_insert_flip_char(tty, ch, flag);
+                tty_insert_flip_char(tport, ch, flag);
         }
         return tty;
 }
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index ba7863bbbb4d..675343a20f24 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2792,10 +2792,10 @@ EXPORT_SYMBOL_GPL(uart_handle_cts_change);
 void uart_insert_char(struct uart_port *port, unsigned int status,
                  unsigned int overrun, unsigned int ch, unsigned int flag)
 {
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
 
         if ((status & port->ignore_status_mask & ~overrun) == 0)
-                if (tty_insert_flip_char(tty, ch, flag) == 0)
+                if (tty_insert_flip_char(tport, ch, flag) == 0)
                         ++port->icount.buf_overrun;
 
         /*
@@ -2803,7 +2803,7 @@ void uart_insert_char(struct uart_port *port, unsigned int status,
          * it doesn't affect the current character.
          */
         if (status & ~port->ignore_status_mask & overrun)
-                if (tty_insert_flip_char(tty, 0, TTY_OVERRUN) == 0)
+                if (tty_insert_flip_char(tport, 0, TTY_OVERRUN) == 0)
                         ++port->icount.buf_overrun;
 }
 EXPORT_SYMBOL_GPL(uart_insert_char);
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index cf96314770fb..ecef748f5385 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -620,7 +620,7 @@ static void sci_receive_chars(struct uart_port *port)
                             sci_port->break_flag)
                                 count = 0;
                         else
-                                tty_insert_flip_char(tty, c, TTY_NORMAL);
+                                tty_insert_flip_char(tport, c, TTY_NORMAL);
                 } else {
                         for (i = 0; i < count; i++) {
                                 char c = serial_port_in(port, SCxRDR);
@@ -662,7 +662,7 @@ static void sci_receive_chars(struct uart_port *port)
                                 } else
                                         flag = TTY_NORMAL;
 
-                                tty_insert_flip_char(tty, c, flag);
+                                tty_insert_flip_char(tport, c, flag);
                         }
                 }
 
@@ -721,7 +721,8 @@ static int sci_handle_errors(struct uart_port *port)
 {
         int copied = 0;
         unsigned short status = serial_port_in(port, SCxSR);
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tport->tty;
         struct sci_port *s = to_sci_port(port);
 
         /*
@@ -732,7 +733,7 @@ static int sci_handle_errors(struct uart_port *port)
                         port->icount.overrun++;
 
                         /* overrun error */
-                        if (tty_insert_flip_char(tty, 0, TTY_OVERRUN))
+                        if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
                                 copied++;
 
                         dev_notice(port->dev, "overrun error");
@@ -756,7 +757,7 @@ static int sci_handle_errors(struct uart_port *port)
 
                                 dev_dbg(port->dev, "BREAK detected\n");
 
-                                if (tty_insert_flip_char(tty, 0, TTY_BREAK))
+                                if (tty_insert_flip_char(tport, 0, TTY_BREAK))
                                         copied++;
                         }
 
@@ -764,7 +765,7 @@ static int sci_handle_errors(struct uart_port *port)
                         /* frame error */
                         port->icount.frame++;
 
-                        if (tty_insert_flip_char(tty, 0, TTY_FRAME))
+                        if (tty_insert_flip_char(tport, 0, TTY_FRAME))
                                 copied++;
 
                         dev_notice(port->dev, "frame error\n");
@@ -775,7 +776,7 @@ static int sci_handle_errors(struct uart_port *port)
                 /* parity error */
                 port->icount.parity++;
 
-                if (tty_insert_flip_char(tty, 0, TTY_PARITY))
+                if (tty_insert_flip_char(tport, 0, TTY_PARITY))
                         copied++;
 
                 dev_notice(port->dev, "parity error");
@@ -789,7 +790,8 @@ static int sci_handle_errors(struct uart_port *port)
 
 static int sci_handle_fifo_overrun(struct uart_port *port)
 {
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tport->tty;
         struct sci_port *s = to_sci_port(port);
         struct plat_sci_reg *reg;
         int copied = 0;
@@ -803,7 +805,7 @@ static int sci_handle_fifo_overrun(struct uart_port *port)
 
                 port->icount.overrun++;
 
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
                 tty_flip_buffer_push(tty);
 
                 dev_notice(port->dev, "overrun error\n");
@@ -817,7 +819,8 @@ static int sci_handle_breaks(struct uart_port *port)
 {
         int copied = 0;
         unsigned short status = serial_port_in(port, SCxSR);
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tport->tty;
         struct sci_port *s = to_sci_port(port);
 
         if (uart_handle_break(port))
@@ -832,7 +835,7 @@ static int sci_handle_breaks(struct uart_port *port)
                 port->icount.brk++;
 
                 /* Notify of BREAK */
-                if (tty_insert_flip_char(tty, 0, TTY_BREAK))
+                if (tty_insert_flip_char(tport, 0, TTY_BREAK))
                         copied++;
 
                 dev_dbg(port->dev, "BREAK detected\n");
@@ -1260,8 +1263,7 @@ static void sci_dma_tx_complete(void *arg)
 }
 
 /* Locking: called with port lock held */
-static int sci_dma_rx_push(struct sci_port *s, struct tty_struct *tty,
-                           size_t count)
+static int sci_dma_rx_push(struct sci_port *s, size_t count)
 {
         struct uart_port *port = &s->port;
         struct tty_port *tport = &port->state->port;
@@ -1285,7 +1287,7 @@ static int sci_dma_rx_push(struct sci_port *s, struct tty_struct *tty,
                 return room;
 
         for (i = 0; i < room; i++)
-                tty_insert_flip_char(tty, ((u8 *)sg_virt(&s->sg_rx[active]))[i],
+                tty_insert_flip_char(tport, ((u8 *)sg_virt(&s->sg_rx[active]))[i],
                                      TTY_NORMAL);
 
         port->icount.rx += room;
@@ -1305,7 +1307,7 @@ static void sci_dma_rx_complete(void *arg)
 
         spin_lock_irqsave(&port->lock, flags);
 
-        count = sci_dma_rx_push(s, tty, s->buf_len_rx);
+        count = sci_dma_rx_push(s, s->buf_len_rx);
 
         mod_timer(&s->rx_timer, jiffies + s->rx_timeout);
 
@@ -1418,7 +1420,7 @@ static void work_fn_rx(struct work_struct *work)
                         sh_desc->partial, sh_desc->cookie);
 
                 spin_lock_irqsave(&port->lock, flags);
-                count = sci_dma_rx_push(s, tty, sh_desc->partial);
+                count = sci_dma_rx_push(s, sh_desc->partial);
                 spin_unlock_irqrestore(&port->lock, flags);
 
                 if (count)
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index 1c6de9f58699..283232c64656 100644
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -457,6 +457,7 @@ static int sn_debug_printf(const char *fmt, ...)
 static void
 sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
 {
+        struct tty_port *tport = NULL;
         int ch;
         struct tty_struct *tty;
 
@@ -472,7 +473,8 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
 
         if (port->sc_port.state) {
                 /* The serial_core stuffs are initialized, use them */
-                tty = port->sc_port.state->port.tty;
+                tport = &port->sc_port.state->port;
+                tty = tport->tty;
         }
         else {
                 /* Not registered yet - can't pass to tty layer.  */
@@ -517,7 +519,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
 
                 /* record the character to pass up to the tty layer */
                 if (tty) {
-                        if(tty_insert_flip_char(tty, ch, TTY_NORMAL) == 0)
+                        if (tty_insert_flip_char(tport, ch, TTY_NORMAL) == 0)
                                 break;
                 }
                 port->sc_port.icount.rx++;
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index b9bf9c53f7fd..bbb102e3c035 100644
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -99,7 +99,7 @@ static int receive_chars_getchar(struct uart_port *port, struct tty_struct *tty)
                         uart_handle_dcd_change(port, 1);
                 }
 
-                if (tty == NULL) {
+                if (port->state == NULL) {
                         uart_handle_sysrq_char(port, c);
                         continue;
                 }
@@ -109,7 +109,7 @@ static int receive_chars_getchar(struct uart_port *port, struct tty_struct *tty)
                 if (uart_handle_sysrq_char(port, c))
                         continue;
 
-                tty_insert_flip_char(tty, c, TTY_NORMAL);
+                tty_insert_flip_char(&port->state->port, c, TTY_NORMAL);
         }
 
         return saw_console_brk;
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index bd8b3b634103..4abc4d43a8e8 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -111,6 +111,7 @@ static struct tty_struct *
 receive_chars(struct uart_sunsab_port *up,
               union sab82532_irq_status *stat)
 {
+        struct tty_port *port = NULL;
         struct tty_struct *tty = NULL;
         unsigned char buf[32];
         int saw_console_brk = 0;
@@ -118,8 +119,10 @@ receive_chars(struct uart_sunsab_port *up,
         int count = 0;
         int i;
 
-        if (up->port.state != NULL)             /* Unopened serial console */
-                tty = up->port.state->port.tty;
+        if (up->port.state != NULL) {           /* Unopened serial console */
+                port = &up->port.state->port;
+                tty = port->tty;
+        }
 
         /* Read number of BYTES (Character + Status) available. */
         if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
@@ -160,11 +163,6 @@ receive_chars(struct uart_sunsab_port *up,
         for (i = 0; i < count; i++) {
                 unsigned char ch = buf[i], flag;
 
-                if (tty == NULL) {
-                        uart_handle_sysrq_char(&up->port, ch);
-                        continue;
-                }
-
                 flag = TTY_NORMAL;
                 up->port.icount.rx++;
 
@@ -213,9 +211,9 @@ receive_chars(struct uart_sunsab_port *up,
 
                 if ((stat->sreg.isr0 & (up->port.ignore_status_mask & 0xff)) == 0 &&
                     (stat->sreg.isr1 & ((up->port.ignore_status_mask >> 8) & 0xff)) == 0)
-                        tty_insert_flip_char(tty, ch, flag);
+                        tty_insert_flip_char(port, ch, flag);
                 if (stat->sreg.isr0 & SAB82532_ISR0_RFO)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(port, 0, TTY_OVERRUN);
         }
 
         if (saw_console_brk)
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 220da3f9724f..52325968b06c 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -318,7 +318,8 @@ static void sunsu_enable_ms(struct uart_port *port)
 static struct tty_struct *
 receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 {
-        struct tty_struct *tty = up->port.state->port.tty;
+        struct tty_port *port = &up->port.state->port;
+        struct tty_struct *tty = port->tty;
         unsigned char ch, flag;
         int max_count = 256;
         int saw_console_brk = 0;
@@ -376,14 +377,14 @@ receive_chars(struct uart_sunsu_port *up, unsigned char *status)
                 if (uart_handle_sysrq_char(&up->port, ch))
                         goto ignore_char;
                 if ((*status & up->port.ignore_status_mask) == 0)
-                        tty_insert_flip_char(tty, ch, flag);
+                        tty_insert_flip_char(port, ch, flag);
                 if (*status & UART_LSR_OE)
                         /*
                          * Overrun is special, since it's reported
                          * immediately, and doesn't affect the current
                          * character.
                          */
-                         tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                         tty_insert_flip_char(port, 0, TTY_OVERRUN);
         ignore_char:
                 *status = serial_inp(up, UART_LSR);
         } while ((*status & UART_LSR_DR) && (max_count-- > 0));
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index aef4fab957c3..4a11be3849f6 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -327,13 +327,15 @@ static struct tty_struct *
 sunzilog_receive_chars(struct uart_sunzilog_port *up,
                        struct zilog_channel __iomem *channel)
 {
+        struct tty_port *port = NULL;
         struct tty_struct *tty;
         unsigned char ch, r1, flag;
 
         tty = NULL;
-        if (up->port.state != NULL &&           /* Unopened serial console */
-            up->port.state->port.tty != NULL)   /* Keyboard || mouse */
-                tty = up->port.state->port.tty;
+        if (up->port.state != NULL) {           /* Unopened serial console */
+                port = &up->port.state->port;
+                tty = port->tty;                /* mouse => tty is NULL */
+        }
 
         for (;;) {
 
@@ -366,11 +368,6 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
                         continue;
                 }
 
-                if (tty == NULL) {
-                        uart_handle_sysrq_char(&up->port, ch);
-                        continue;
-                }
-
                 /* A real serial line, record the character and status.  */
                 flag = TTY_NORMAL;
                 up->port.icount.rx++;
@@ -400,10 +397,10 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
 
                 if (up->port.ignore_status_mask == 0xff ||
                     (r1 & up->port.ignore_status_mask) == 0) {
-                        tty_insert_flip_char(tty, ch, flag);
+                        tty_insert_flip_char(port, ch, flag);
                 }
                 if (r1 & Rx_OVR)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(port, 0, TTY_OVERRUN);
         }
 
         return tty;
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index 5be0d68feceb..f40c634f7528 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -91,12 +91,12 @@ static void timbuart_flush_buffer(struct uart_port *port)
 
 static void timbuart_rx_chars(struct uart_port *port)
 {
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
 
         while (ioread32(port->membase + TIMBUART_ISR) & RXDP) {
                 u8 ch = ioread8(port->membase + TIMBUART_RXFIFO);
                 port->icount.rx++;
-                tty_insert_flip_char(tty, ch, TTY_NORMAL);
+                tty_insert_flip_char(tport, ch, TTY_NORMAL);
         }
 
         spin_unlock(&port->lock);
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 89eee43c4e2d..5caf1f0ebc82 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -66,7 +66,7 @@ static struct uart_port ulite_ports[ULITE_NR_UARTS];
 
 static int ulite_receive(struct uart_port *port, int stat)
 {
-        struct tty_struct *tty = port->state->port.tty;
+        struct tty_port *tport = &port->state->port;
         unsigned char ch = 0;
         char flag = TTY_NORMAL;
 
@@ -103,13 +103,13 @@ static int ulite_receive(struct uart_port *port, int stat)
         stat &= ~port->ignore_status_mask;
 
         if (stat & ULITE_STATUS_RXVALID)
-                tty_insert_flip_char(tty, ch, flag);
+                tty_insert_flip_char(tport, ch, flag);
 
         if (stat & ULITE_STATUS_FRAME)
-                tty_insert_flip_char(tty, 0, TTY_FRAME);
+                tty_insert_flip_char(tport, 0, TTY_FRAME);
 
         if (stat & ULITE_STATUS_OVERRUN)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
 
         return 1;
 }
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index ed047d9ab1e2..7a2378627fa5 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -513,7 +513,7 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port)
                                 continue;
 
 error_return:
-                        tty_insert_flip_char(tty, ch, flg);
+                        tty_insert_flip_char(tport, ch, flg);
 
                 }
 
@@ -561,7 +561,7 @@ handle_error:
 
         /* Overrun does not affect the current character ! */
         if (status & BD_SC_OV)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
 #ifdef SUPPORT_SYSRQ
         port->sysrq = 0;
 #endif
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 8fd181436a6b..7f4112423f3d 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -136,7 +136,8 @@ static void vt8500_enable_ms(struct uart_port *port)
 
 static void handle_rx(struct uart_port *port)
 {
-        struct tty_struct *tty = tty_port_tty_get(&port->state->port);
+        struct tty_port *tport = &port->state->port;
+        struct tty_struct *tty = tty_port_tty_get(tport);
         if (!tty) {
                 /* Discard data: no tty available */
                 int count = (vt8500_read(port, VT8500_URFIDX) & 0x1f00) >> 8;
@@ -151,7 +152,7 @@ static void handle_rx(struct uart_port *port)
          */
         if ((vt8500_read(port, VT8500_URISR) & RXOVER)) {
                 port->icount.overrun++;
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(tport, 0, TTY_OVERRUN);
         }
 
         /* and now the main RX loop */
@@ -174,7 +175,7 @@ static void handle_rx(struct uart_port *port)
                 port->icount.rx++;
 
                 if (!uart_handle_sysrq_char(port, c))
-                        tty_insert_flip_char(tty, c, flag);
+                        tty_insert_flip_char(tport, c, flag);
         }
 
         tty_flip_buffer_push(tty);