1 files changed, 2 insertions, 18 deletions

diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 1d85533d46d2..a37579ce6d76 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -1717,11 +1717,9 @@ ioc4_change_speed(struct uart_port *the_port,
         }
 
         if (cflag & CRTSCTS) {
-                info->flags |= ASYNC_CTS_FLOW;
                 port->ip_sscr |= IOC4_SSCR_HFC_EN;
         }
         else {
-                info->flags &= ~ASYNC_CTS_FLOW;
                 port->ip_sscr &= ~IOC4_SSCR_HFC_EN;
         }
         writel(port->ip_sscr, &port->ip_serial_regs->sscr);
@@ -1760,18 +1758,6 @@ static inline int ic4_startup_local(struct uart_port *the_port)
 
         info = the_port->info;
 
-        if (info->tty) {
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                        info->tty->alt_speed = 57600;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                        info->tty->alt_speed = 115200;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                        info->tty->alt_speed = 230400;
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                        info->tty->alt_speed = 460800;
-        }
         local_open(port);
 
         /* set the speed of the serial port */
@@ -2315,7 +2301,6 @@ static void receive_chars(struct uart_port *the_port)
         int read_count, request_count = IOC4_MAX_CHARS;
         struct uart_icount *icount;
         struct uart_info *info = the_port->info;
-        int flip = 0;
         unsigned long pflags;
 
         /* Make sure all the pointers are "good" ones */
@@ -2327,7 +2312,7 @@ static void receive_chars(struct uart_port *the_port)
         spin_lock_irqsave(&the_port->lock, pflags);
         tty = info->tty;
 
-        request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS - 2);
+        request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS);
 
         if (request_count > 0) {
                 icount = &the_port->icount;
@@ -2340,8 +2325,7 @@ static void receive_chars(struct uart_port *the_port)
 
         spin_unlock_irqrestore(&the_port->lock, pflags);
 
-        if (flip)
-                tty_flip_buffer_push(tty);
+        tty_flip_buffer_push(tty);
 }
 
 /**