1 files changed, 6 insertions, 23 deletions

diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index a1d303f9a33d..902c48dca3bc 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -182,7 +182,6 @@ static int sx_poll = HZ;
 #define RS_EVENT_WRITE_WAKEUP   0
 
 static struct tty_driver *specialix_driver;
-static unsigned char * tmp_buf;
 
 static unsigned long baud_table[] =  {
         0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
@@ -1087,24 +1086,16 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                 port->MSVR =  (sx_in(bp, CD186x_MSVR) & MSVR_RTS);
         spin_unlock_irqrestore(&bp->lock, flags);
         dprintk (SX_DEBUG_TERMIOS, "sx: got MSVR=%02x.\n", port->MSVR);
-        baud = C_BAUD(tty);
+        baud = tty_get_baud_rate(tty);
 
-        if (baud & CBAUDEX) {
-                baud &= ~CBAUDEX;
-                if (baud < 1 || baud > 2)
-                        port->tty->termios->c_cflag &= ~CBAUDEX;
-                else
-                        baud += 15;
-        }
-        if (baud == 15) {
+        if (baud == 38400) {
                 if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                         baud ++;
                 if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
                         baud += 2;
         }
 
-
-        if (!baud_table[baud]) {
+        if (!baud) {
                 /* Drop DTR & exit */
                 dprintk (SX_DEBUG_TERMIOS, "Dropping DTR...  Hmm....\n");
                 if (!SX_CRTSCTS (tty)) {
@@ -1134,7 +1125,7 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                                   "This is an untested option, please be carefull.\n",
                                   port_No (port), tmp);
         else
-                tmp = (((SX_OSCFREQ + baud_table[baud]/2) / baud_table[baud] +
+                tmp = (((SX_OSCFREQ + baud/2) / baud +
                          CD186x_TPC/2) / CD186x_TPC);
 
         if ((tmp < 0x10) && time_before(again, jiffies)) {
@@ -1682,7 +1673,7 @@ static int sx_write(struct tty_struct * tty,
 
         bp = port_Board(port);
 
-        if (!port->xmit_buf || !tmp_buf) {
+        if (!port->xmit_buf) {
                 func_exit();
                 return 0;
         }
@@ -2372,7 +2363,7 @@ static void do_softint(void *private_)
         func_exit();
 }
 
-static struct tty_operations sx_ops = {
+static const struct tty_operations sx_ops = {
         .open  = sx_open,
         .close = sx_close,
         .write = sx_write,
@@ -2406,12 +2397,6 @@ static int sx_init_drivers(void)
                 return 1;
         }
 
-        if (!(tmp_buf = (unsigned char *) get_zeroed_page(GFP_KERNEL))) {
-                printk(KERN_ERR "sx: Couldn't get free page.\n");
-                put_tty_driver(specialix_driver);
-                func_exit();
-                return 1;
-        }
         specialix_driver->owner = THIS_MODULE;
         specialix_driver->name = "ttyW";
         specialix_driver->major = SPECIALIX_NORMAL_MAJOR;
@@ -2425,7 +2410,6 @@ static int sx_init_drivers(void)
 
         if ((error = tty_register_driver(specialix_driver))) {
                 put_tty_driver(specialix_driver);
-                free_page((unsigned long)tmp_buf);
                 printk(KERN_ERR "sx: Couldn't register specialix IO8+ driver, error = %d\n",
                        error);
                 func_exit();
@@ -2451,7 +2435,6 @@ static void sx_release_drivers(void)
 {
         func_enter();
 
-        free_page((unsigned long)tmp_buf);
         tty_unregister_driver(specialix_driver);
         put_tty_driver(specialix_driver);
         func_exit();