1 files changed, 4 insertions, 30 deletions

diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c
index 5e59c0b42731..e769811e7417 100644
--- a/drivers/char/generic_serial.c
+++ b/drivers/char/generic_serial.c
@@ -33,8 +33,6 @@
 
 #define DEBUG 
 
-static char *                  tmp_buf; 
-
 static int gs_debug;
 
 #ifdef DEBUG
@@ -205,7 +203,7 @@ int gs_write(struct tty_struct * tty,
         if (!tty) return -EIO;
 
         port = tty->driver_data;
-        if (!port || !port->xmit_buf || !tmp_buf)
+        if (!port || !port->xmit_buf)
                 return -EIO;
 
         local_save_flags(flags);
@@ -720,11 +718,11 @@ static unsigned int     gs_baudrates[] = {
 
 
 void gs_set_termios (struct tty_struct * tty, 
-                     struct termios * old_termios)
+                     struct ktermios * old_termios)
 {
         struct gs_port *port;
         int baudrate, tmp, rv;
-        struct termios *tiosp;
+        struct ktermios *tiosp;
 
         func_enter();
 
@@ -746,11 +744,9 @@ void gs_set_termios (struct tty_struct * tty,
                 gs_dprintk (GS_DEBUG_TERMIOS, "termios structure (%p):\n", tiosp);
         }
 
-#if 0
         /* This is an optimization that is only allowed for dumb cards */
         /* Smart cards require knowledge of iflags and oflags too: that 
            might change hardware cooking mode.... */
-#endif
         if (old_termios) {
                 if(   (tiosp->c_iflag == old_termios->c_iflag)
                    && (tiosp->c_oflag == old_termios->c_oflag)
@@ -774,14 +770,7 @@ void gs_set_termios (struct tty_struct * tty,
                 if(!memcmp(tiosp->c_cc, old_termios->c_cc, NCC)) printk("c_cc changed\n");
         }
 
-        baudrate = tiosp->c_cflag & CBAUD;
-        if (baudrate & CBAUDEX) {
-                baudrate &= ~CBAUDEX;
-                if ((baudrate < 1) || (baudrate > 4))
-                        tiosp->c_cflag &= ~CBAUDEX;
-                else
-                        baudrate += 15;
-        }
+        baudrate = tty_get_baud_rate(tty);
 
         baudrate = gs_baudrates[baudrate];
         if ((tiosp->c_cflag & CBAUD) == B38400) {
@@ -846,24 +835,9 @@ void gs_set_termios (struct tty_struct * tty,
 int gs_init_port(struct gs_port *port)
 {
         unsigned long flags;
-        unsigned long page;
 
         func_enter ();
 
-        if (!tmp_buf) {
-                page = get_zeroed_page(GFP_KERNEL);
-                spin_lock_irqsave (&port->driver_lock, flags); /* Don't expect this to make a difference. */
-                if (tmp_buf)
-                        free_page(page);
-                else
-                        tmp_buf = (unsigned char *) page;
-                spin_unlock_irqrestore (&port->driver_lock, flags);
-                if (!tmp_buf) {
-                        func_exit ();
-                        return -ENOMEM;
-                }
-        }
-
         if (port->flags & ASYNC_INITIALIZED) {
                 func_exit ();
                 return 0;