6 files changed, 10 insertions, 13 deletions

diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
index 59b7bbad8394..21b57a66e809 100644
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -46,13 +46,14 @@ typedef union _srmcons_result {
 static int
 srmcons_do_receive_chars(struct tty_struct *tty)
 {
+        struct tty_port *port = tty->port;
         srmcons_result result;
         int count = 0, loops = 0;
 
         do {
                 result.as_long = callback_getc(0);
                 if (result.bits.status < 2) {
-                        tty_insert_flip_char(tty, (char)result.bits.c, 0);
+                        tty_insert_flip_char(port, (char)result.bits.c, 0);
                         count++;
                 }
         } while((result.bits.status & 1) && (++loops < 10));
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index fc3924d18c1f..f8ae5d8eb106 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -55,6 +55,7 @@ static struct console *console;
 
 static void receive_chars(struct tty_struct *tty)
 {
+        struct tty_port *port = tty->port;
         unsigned char ch;
         static unsigned char seen_esc = 0;
 
@@ -81,7 +82,7 @@ static void receive_chars(struct tty_struct *tty)
                 }
                 seen_esc = 0;
 
-                if (tty_insert_flip_char(tty, ch, TTY_NORMAL) == 0)
+                if (tty_insert_flip_char(port, ch, TTY_NORMAL) == 0)
                         break;
         }
         tty_flip_buffer_push(tty);
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index 9b2232a78ff9..54ef40ceaaed 100644
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -667,14 +667,14 @@ insert:
                 else
                         flag = TTY_NORMAL;
 
-                tty_insert_flip_char(tty, ch, flag);
+                tty_insert_flip_char(port, ch, flag);
         }
 
         /* overrun is special, since it's reported immediately, and doesn't
          * affect the current character
          */
         if (overrun)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                tty_insert_flip_char(port, 0, TTY_OVERRUN);
 
         count--;
         if (count <= 0) {
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c
index efc5e7d30530..4d92a379eb21 100644
--- a/arch/parisc/kernel/pdc_cons.c
+++ b/arch/parisc/kernel/pdc_cons.c
@@ -147,7 +147,7 @@ static void pdc_console_poll(unsigned long unused)
                 data = pdc_console_poll_key(NULL);
                 if (data == -1)
                         break;
-                tty_insert_flip_char(tty, data & 0xFF, TTY_NORMAL);
+                tty_insert_flip_char(&tty_port, data & 0xFF, TTY_NORMAL);
                 count ++;
         }
 
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 4ff2503a1bb8..795bd8102205 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -81,12 +81,6 @@ static const struct chan_ops not_configged_ops = {
 };
 #endif /* CONFIG_NOCONFIG_CHAN */
 
-static void tty_receive_char(struct tty_struct *tty, char ch)
-{
-        if (tty)
-                tty_insert_flip_char(tty, ch, TTY_NORMAL);
-}
-
 static int open_one_chan(struct chan *chan)
 {
         int fd, err;
@@ -569,7 +563,7 @@ void chan_interrupt(struct line *line, struct tty_struct *tty, int irq)
                 }
                 err = chan->ops->read(chan->fd, &c, chan->data);
                 if (err > 0)
-                        tty_receive_char(tty, c);
+                        tty_insert_flip_char(port, c, TTY_NORMAL);
         } while (err > 0);
 
         if (err == 0)
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 8207a119eee9..62447d63890c 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -98,6 +98,7 @@ static int rs_write(struct tty_struct * tty,
 static void rs_poll(unsigned long priv)
 {
         struct tty_struct* tty = (struct tty_struct*) priv;
+        struct tty_port *port = tty->port;
 
         struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
         int i = 0;
@@ -107,7 +108,7 @@ static void rs_poll(unsigned long priv)
 
         while (__simc(SYS_select_one, 0, XTISS_SELECT_ONE_READ, (int)&tv,0,0)){
                 __simc (SYS_read, 0, (unsigned long)&c, 1, 0, 0);
-                tty_insert_flip_char(tty, c, TTY_NORMAL);
+                tty_insert_flip_char(port, c, TTY_NORMAL);
                 i++;
         }