1 files changed, 11 insertions, 17 deletions

diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index bd8b3b634103..8de2213664e0 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -107,11 +107,11 @@ static __inline__ void sunsab_cec_wait(struct uart_sunsab_port *up)
                 udelay(1);
 }
 
-static struct tty_struct *
+static struct tty_port *
 receive_chars(struct uart_sunsab_port *up,
               union sab82532_irq_status *stat)
 {
-        struct tty_struct *tty = NULL;
+        struct tty_port *port = NULL;
         unsigned char buf[32];
         int saw_console_brk = 0;
         int free_fifo = 0;
@@ -119,7 +119,7 @@ receive_chars(struct uart_sunsab_port *up,
         int i;
 
         if (up->port.state != NULL)             /* Unopened serial console */
-                tty = up->port.state->port.tty;
+                port = &up->port.state->port;
 
         /* Read number of BYTES (Character + Status) available. */
         if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
@@ -136,7 +136,7 @@ receive_chars(struct uart_sunsab_port *up,
         if (stat->sreg.isr0 & SAB82532_ISR0_TIME) {
                 sunsab_cec_wait(up);
                 writeb(SAB82532_CMDR_RFRD, &up->regs->w.cmdr);
-                return tty;
+                return port;
         }
 
         if (stat->sreg.isr0 & SAB82532_ISR0_RFO)
@@ -160,11 +160,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,15 +208,15 @@ 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)
                 sun_do_break();
 
-        return tty;
+        return port;
 }
 
 static void sunsab_stop_tx(struct uart_port *);
@@ -304,7 +299,7 @@ static void check_status(struct uart_sunsab_port *up,
 static irqreturn_t sunsab_interrupt(int irq, void *dev_id)
 {
         struct uart_sunsab_port *up = dev_id;
-        struct tty_struct *tty;
+        struct tty_port *port = NULL;
         union sab82532_irq_status status;
         unsigned long flags;
         unsigned char gis;
@@ -318,12 +313,11 @@ static irqreturn_t sunsab_interrupt(int irq, void *dev_id)
         if (gis & 2)
                 status.sreg.isr1 = readb(&up->regs->r.isr1);
 
-        tty = NULL;
         if (status.stat) {
                 if ((status.sreg.isr0 & (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
                                          SAB82532_ISR0_RFO | SAB82532_ISR0_RPF)) ||
                     (status.sreg.isr1 & SAB82532_ISR1_BRK))
-                        tty = receive_chars(up, &status);
+                        port = receive_chars(up, &status);
                 if ((status.sreg.isr0 & SAB82532_ISR0_CDSC) ||
                     (status.sreg.isr1 & SAB82532_ISR1_CSC))
                         check_status(up, &status);
@@ -333,8 +327,8 @@ static irqreturn_t sunsab_interrupt(int irq, void *dev_id)
 
         spin_unlock_irqrestore(&up->port.lock, flags);
 
-        if (tty)
-                tty_flip_buffer_push(tty);
+        if (port)
+                tty_flip_buffer_push(port);
 
         return IRQ_HANDLED;
 }