1 files changed, 13 insertions, 26 deletions

diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index 5dae32521620..050e70ee5920 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -46,6 +46,7 @@
 #include <linux/major.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/tty_flip.h>
 
 #include <asm/uaccess.h>
 
@@ -354,28 +355,17 @@ static inline void rc_receive_exc(struct riscom_board const * bp)
         struct riscom_port *port;
         struct tty_struct *tty;
         unsigned char status;
-        unsigned char ch;
+        unsigned char ch, flag;
         
         if (!(port = rc_get_port(bp, "Receive")))
                 return;
 
         tty = port->tty;
-        if (tty->flip.count >= TTY_FLIPBUF_SIZE)  {
-                printk(KERN_WARNING "rc%d: port %d: Working around flip "
-                                    "buffer overflow.\n",
-                       board_No(bp), port_No(port));
-                return;
-        }
         
 #ifdef RC_REPORT_OVERRUN        
         status = rc_in(bp, CD180_RCSR);
-        if (status & RCSR_OE)  {
+        if (status & RCSR_OE)
                 port->overrun++;
-#if 0           
-                printk(KERN_ERR "rc%d: port %d: Overrun. Total %ld overruns\n", 
-                       board_No(bp), port_No(port), port->overrun);
-#endif          
-        }
         status &= port->mark_mask;
 #else   
         status = rc_in(bp, CD180_RCSR) & port->mark_mask;
@@ -393,25 +383,24 @@ static inline void rc_receive_exc(struct riscom_board const * bp)
         } else if (status & RCSR_BREAK)  {
                 printk(KERN_INFO "rc%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;
+                flag = TTY_NORMAL;
         
-        *tty->flip.char_buf_ptr++ = ch;
-        tty->flip.count++;
-        schedule_delayed_work(&tty->flip.work, 1);
+        tty_insert_flip_char(tty, ch, flag);
+        tty_flip_buffer_push(tty);
 }
 
 static inline void rc_receive(struct riscom_board const * bp)
@@ -432,17 +421,15 @@ static inline void rc_receive(struct riscom_board const * bp)
 #endif  
         
         while (count--)  {
-                if (tty->flip.count >= TTY_FLIPBUF_SIZE)  {
+                if (tty_buffer_request_room(tty, 1) == 0)  {
                         printk(KERN_WARNING "rc%d: port %d: Working around "
                                             "flip buffer overflow.\n",
                                board_No(bp), port_No(port));
                         break;
                 }
-                *tty->flip.char_buf_ptr++ = rc_in(bp, CD180_RDR);
-                *tty->flip.flag_buf_ptr++ = 0;
-                tty->flip.count++;
+                tty_insert_flip_char(tty, rc_in(bp, CD180_RDR), TTY_NORMAL);
         }
-        schedule_delayed_work(&tty->flip.work, 1);
+        tty_flip_buffer_push(tty);
 }
 
 static inline void rc_transmit(struct riscom_board const * bp)