1 files changed, 15 insertions, 35 deletions

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index acef2abf3f0d..0e20780d4a29 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -2901,7 +2901,8 @@ static int stl_getportstats(stlport_t *portp, comstats_t __user *cp)
         if (portp->tty != (struct tty_struct *) NULL) {
                 if (portp->tty->driver_data == portp) {
                         portp->stats.ttystate = portp->tty->flags;
-                        portp->stats.rxbuffered = portp->tty->flip.count;
+                        /* No longer available as a statistic */
+                        portp->stats.rxbuffered = 1; /*portp->tty->flip.count; */
                         if (portp->tty->termios != (struct termios *) NULL) {
                                 portp->stats.cflags = portp->tty->termios->c_cflag;
                                 portp->stats.iflags = portp->tty->termios->c_iflag;
@@ -4045,9 +4046,7 @@ static void stl_cd1400rxisr(stlpanel_t *panelp, int ioaddr)
         if ((ioack & ACK_TYPMASK) == ACK_TYPRXGOOD) {
                 outb((RDCR + portp->uartaddr), ioaddr);
                 len = inb(ioaddr + EREG_DATA);
-                if ((tty == (struct tty_struct *) NULL) ||
-                    (tty->flip.char_buf_ptr == (char *) NULL) ||
-                    ((buflen = TTY_FLIPBUF_SIZE - tty->flip.count) == 0)) {
+                if (tty == NULL || (buflen = tty_buffer_request_room(tty, len)) == 0) {
                         len = MIN(len, sizeof(stl_unwanted));
                         outb((RDSR + portp->uartaddr), ioaddr);
                         insb((ioaddr + EREG_DATA), &stl_unwanted[0], len);
@@ -4056,12 +4055,10 @@ static void stl_cd1400rxisr(stlpanel_t *panelp, int ioaddr)
                 } else {
                         len = MIN(len, buflen);
                         if (len > 0) {
+                                unsigned char *ptr;
                                 outb((RDSR + portp->uartaddr), ioaddr);
-                                insb((ioaddr + EREG_DATA), tty->flip.char_buf_ptr, len);
-                                memset(tty->flip.flag_buf_ptr, 0, len);
-                                tty->flip.flag_buf_ptr += len;
-                                tty->flip.char_buf_ptr += len;
-                                tty->flip.count += len;
+                                tty_prepare_flip_string(tty, &ptr, len);
+                                insb((ioaddr + EREG_DATA), ptr, len);
                                 tty_schedule_flip(tty);
                                 portp->stats.rxtotal += len;
                         }
@@ -4085,8 +4082,7 @@ static void stl_cd1400rxisr(stlpanel_t *panelp, int ioaddr)
                                 portp->stats.txxoff++;
                         goto stl_rxalldone;
                 }
-                if ((tty != (struct tty_struct *) NULL) &&
-                    ((portp->rxignoremsk & status) == 0)) {
+                if (tty != NULL && (portp->rxignoremsk & status) == 0) {
                         if (portp->rxmarkmsk & status) {
                                 if (status & ST_BREAK) {
                                         status = TTY_BREAK;
@@ -4106,14 +4102,8 @@ static void stl_cd1400rxisr(stlpanel_t *panelp, int ioaddr)
                         } else {
                                 status = 0;
                         }
-                        if (tty->flip.char_buf_ptr != (char *) NULL) {
-                                if (tty->flip.count < TTY_FLIPBUF_SIZE) {
-                                        *tty->flip.flag_buf_ptr++ = status;
-                                        *tty->flip.char_buf_ptr++ = ch;
-                                        tty->flip.count++;
-                                }
-                                tty_schedule_flip(tty);
-                        }
+                        tty_insert_flip_char(tty, ch, status);
+                        tty_schedule_flip(tty);
                 }
         } else {
                 printk("STALLION: bad RX interrupt ack value=%x\n", ioack);
@@ -5012,9 +5002,7 @@ static void stl_sc26198rxisr(stlport_t *portp, unsigned int iack)
         len = inb(ioaddr + XP_DATA) + 1;
 
         if ((iack & IVR_TYPEMASK) == IVR_RXDATA) {
-                if ((tty == (struct tty_struct *) NULL) ||
-                    (tty->flip.char_buf_ptr == (char *) NULL) ||
-                    ((buflen = TTY_FLIPBUF_SIZE - tty->flip.count) == 0)) {
+                if (tty == NULL || (buflen = tty_buffer_request_room(tty, len)) == 0) {
                         len = MIN(len, sizeof(stl_unwanted));
                         outb(GRXFIFO, (ioaddr + XP_ADDR));
                         insb((ioaddr + XP_DATA), &stl_unwanted[0], len);
@@ -5023,12 +5011,10 @@ static void stl_sc26198rxisr(stlport_t *portp, unsigned int iack)
                 } else {
                         len = MIN(len, buflen);
                         if (len > 0) {
+                                unsigned char *ptr;
                                 outb(GRXFIFO, (ioaddr + XP_ADDR));
-                                insb((ioaddr + XP_DATA), tty->flip.char_buf_ptr, len);
-                                memset(tty->flip.flag_buf_ptr, 0, len);
-                                tty->flip.flag_buf_ptr += len;
-                                tty->flip.char_buf_ptr += len;
-                                tty->flip.count += len;
+                                tty_prepare_flip_string(tty, &ptr, len);
+                                insb((ioaddr + XP_DATA), ptr, len);
                                 tty_schedule_flip(tty);
                                 portp->stats.rxtotal += len;
                         }
@@ -5096,14 +5082,8 @@ static inline void stl_sc26198rxbadch(stlport_t *portp, unsigned char status, ch
                         status = 0;
                 }
 
-                if (tty->flip.char_buf_ptr != (char *) NULL) {
-                        if (tty->flip.count < TTY_FLIPBUF_SIZE) {
-                                *tty->flip.flag_buf_ptr++ = status;
-                                *tty->flip.char_buf_ptr++ = ch;
-                                tty->flip.count++;
-                        }
-                        tty_schedule_flip(tty);
-                }
+                tty_insert_flip_char(tty, ch, status);
+                tty_schedule_flip(tty);
 
                 if (status == 0)
                         portp->stats.rxtotal++;