1 files changed, 14 insertions, 24 deletions

diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 0bbfce43031c..0a574bdbce36 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -85,6 +85,7 @@
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/tty.h>
+#include <linux/tty_flip.h>
 #include <linux/mm.h>
 #include <linux/serial.h>
 #include <linux/fcntl.h>
@@ -665,7 +666,7 @@ static inline void sx_receive_exc(struct specialix_board * bp)
         struct specialix_port *port;
         struct tty_struct *tty;
         unsigned char status;
-        unsigned char ch;
+        unsigned char ch, flag;
 
         func_enter();
 
@@ -676,8 +677,6 @@ static inline void sx_receive_exc(struct specialix_board * bp)
                 return;
         }
         tty = port->tty;
-        dprintk (SX_DEBUG_RX, "port: %p count: %d BUFF_SIZE: %d\n",
-                 port,  tty->flip.count, TTY_FLIPBUF_SIZE);
 
         status = sx_in(bp, CD186x_RCSR);
 
@@ -691,7 +690,7 @@ static inline void sx_receive_exc(struct specialix_board * bp)
 
         /* This flip buffer check needs to be below the reading of the
            status register to reset the chip's IRQ.... */
-        if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
+        if (tty_buffer_request_room(tty, 1) == 0) {
                 dprintk(SX_DEBUG_FIFO, "sx%d: port %d: Working around flip buffer overflow.\n",
                        board_No(bp), port_No(port));
                 func_exit();
@@ -712,26 +711,24 @@ static inline void sx_receive_exc(struct specialix_board * bp)
         } else if (status & RCSR_BREAK) {
                 dprintk(SX_DEBUG_RX, "sx%d: port %d: Handling break...\n",
                        board_No(bp), port_No(port));
-                *tty->flip.flag_buf_ptr++ = TTY_BREAK;
+                flag = TTY_BREAK;
                 if (port->flags & ASYNC_SAK)
                         do_SAK(tty);
 
         } else if (status & RCSR_PE)
-                *tty->flip.flag_buf_ptr++ = TTY_PARITY;
+                flag = TTY_PARITY;
 
         else if (status & RCSR_FE)
-                *tty->flip.flag_buf_ptr++ = TTY_FRAME;
+                flag = TTY_FRAME;
 
         else if (status & RCSR_OE)
-                *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
+                flag = TTY_OVERRUN;
 
         else
-                *tty->flip.flag_buf_ptr++ = 0;
-
-        *tty->flip.char_buf_ptr++ = ch;
-        tty->flip.count++;
-        schedule_delayed_work(&tty->flip.work, 1);
+                flag = TTY_NORMAL;
 
+        if(tty_insert_flip_char(tty, ch, flag))
+                tty_flip_buffer_push(tty);
         func_exit();
 }
 
@@ -755,18 +752,11 @@ static inline void sx_receive(struct specialix_board * bp)
         dprintk (SX_DEBUG_RX, "port: %p: count: %d\n", port, count);
         port->hits[count > 8 ? 9 : count]++;
 
-        while (count--) {
-                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
-                        printk(KERN_INFO "sx%d: port %d: Working around flip buffer overflow.\n",
-                               board_No(bp), port_No(port));
-                        break;
-                }
-                *tty->flip.char_buf_ptr++ = sx_in(bp, CD186x_RDR);
-                *tty->flip.flag_buf_ptr++ = 0;
-                tty->flip.count++;
-        }
-        schedule_delayed_work(&tty->flip.work, 1);
+        tty_buffer_request_room(tty, count);
 
+        while (count--)
+                tty_insert_flip_char(tty, sx_in(bp, CD186x_RDR), TTY_NORMAL);
+        tty_flip_buffer_push(tty);
         func_exit();
 }