3 files changed, 81 insertions, 99 deletions

diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c
index 1d82d5838f0c..164544afd680 100644
--- a/drivers/char/mwave/mwavedd.c
+++ b/drivers/char/mwave/mwavedd.c
@@ -430,7 +430,7 @@ static ssize_t mwave_write(struct file *file, const char __user *buf,
 
 static int register_serial_portandirq(unsigned int port, int irq)
 {
-        struct uart_port uart;
+        struct uart_8250_port uart;
         
         switch ( port ) {
                 case 0x3f8:
@@ -462,14 +462,14 @@ static int register_serial_portandirq(unsigned int port, int irq)
         } /* switch */
         /* irq is okay */
 
-        memset(&uart, 0, sizeof(struct uart_port));
+        memset(&uart, 0, sizeof(uart));
         
-        uart.uartclk =  1843200;
-        uart.iobase = port;
-        uart.irq = irq;
-        uart.iotype = UPIO_PORT;
-        uart.flags =  UPF_SHARE_IRQ;
-        return serial8250_register_port(&uart);
+        uart.port.uartclk =  1843200;
+        uart.port.iobase = port;
+        uart.port.irq = irq;
+        uart.port.iotype = UPIO_PORT;
+        uart.port.flags =  UPF_SHARE_IRQ;
+        return serial8250_register_8250_port(&uart);
 }
 
 
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index a6b8ddea2227..21721d25e388 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -1058,7 +1058,7 @@ static void cts_change(MGSLPC_INFO *info, struct tty_struct *tty)
         wake_up_interruptible(&info->status_event_wait_q);
         wake_up_interruptible(&info->event_wait_q);
 
-        if (tty && (info->port.flags & ASYNC_CTS_FLOW)) {
+        if (tty && tty_port_cts_enabled(&info->port)) {
                 if (tty->hw_stopped) {
                         if (info->serial_signals & SerialSignal_CTS) {
                                 if (debug_level >= DEBUG_LEVEL_ISR)
@@ -1350,7 +1350,7 @@ static void shutdown(MGSLPC_INFO * info, struct tty_struct *tty)
         /* TODO:disable interrupts instead of reset to preserve signal states */
         reset_device(info);
 
-        if (!tty || tty->termios->c_cflag & HUPCL) {
+        if (!tty || tty->termios.c_cflag & HUPCL) {
                 info->serial_signals &= ~(SerialSignal_DTR + SerialSignal_RTS);
                 set_signals(info);
         }
@@ -1391,7 +1391,7 @@ static void mgslpc_program_hw(MGSLPC_INFO *info, struct tty_struct *tty)
         port_irq_enable(info, (unsigned char) PVR_DSR | PVR_RI);
         get_signals(info);
 
-        if (info->netcount || (tty && (tty->termios->c_cflag & CREAD)))
+        if (info->netcount || (tty && (tty->termios.c_cflag & CREAD)))
                 rx_start(info);
 
         spin_unlock_irqrestore(&info->lock,flags);
@@ -1404,14 +1404,14 @@ static void mgslpc_change_params(MGSLPC_INFO *info, struct tty_struct *tty)
         unsigned cflag;
         int bits_per_char;
 
-        if (!tty || !tty->termios)
+        if (!tty)
                 return;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):mgslpc_change_params(%s)\n",
                          __FILE__,__LINE__, info->device_name );
 
-        cflag = tty->termios->c_cflag;
+        cflag = tty->termios.c_cflag;
 
         /* if B0 rate (hangup) specified then negate DTR and RTS */
         /* otherwise assert DTR and RTS */
@@ -1734,7 +1734,7 @@ static void mgslpc_throttle(struct tty_struct * tty)
         if (I_IXOFF(tty))
                 mgslpc_send_xchar(tty, STOP_CHAR(tty));
 
-        if (tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios.c_cflag & CRTSCTS) {
                 spin_lock_irqsave(&info->lock,flags);
                 info->serial_signals &= ~SerialSignal_RTS;
                 set_signals(info);
@@ -1763,7 +1763,7 @@ static void mgslpc_unthrottle(struct tty_struct * tty)
                         mgslpc_send_xchar(tty, START_CHAR(tty));
         }
 
-        if (tty->termios->c_cflag & CRTSCTS) {
+        if (tty->termios.c_cflag & CRTSCTS) {
                 spin_lock_irqsave(&info->lock,flags);
                 info->serial_signals |= SerialSignal_RTS;
                 set_signals(info);
@@ -2299,8 +2299,8 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term
                         tty->driver->name );
 
         /* just return if nothing has changed */
-        if ((tty->termios->c_cflag == old_termios->c_cflag)
-            && (RELEVANT_IFLAG(tty->termios->c_iflag)
+        if ((tty->termios.c_cflag == old_termios->c_cflag)
+            && (RELEVANT_IFLAG(tty->termios.c_iflag)
                 == RELEVANT_IFLAG(old_termios->c_iflag)))
           return;
 
@@ -2308,7 +2308,7 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term
 
         /* Handle transition to B0 status */
         if (old_termios->c_cflag & CBAUD &&
-            !(tty->termios->c_cflag & CBAUD)) {
+            !(tty->termios.c_cflag & CBAUD)) {
                 info->serial_signals &= ~(SerialSignal_RTS + SerialSignal_DTR);
                 spin_lock_irqsave(&info->lock,flags);
                 set_signals(info);
@@ -2317,9 +2317,9 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term
 
         /* Handle transition away from B0 status */
         if (!(old_termios->c_cflag & CBAUD) &&
-            tty->termios->c_cflag & CBAUD) {
+            tty->termios.c_cflag & CBAUD) {
                 info->serial_signals |= SerialSignal_DTR;
-                if (!(tty->termios->c_cflag & CRTSCTS) ||
+                if (!(tty->termios.c_cflag & CRTSCTS) ||
                     !test_bit(TTY_THROTTLED, &tty->flags)) {
                         info->serial_signals |= SerialSignal_RTS;
                 }
@@ -2330,7 +2330,7 @@ static void mgslpc_set_termios(struct tty_struct *tty, struct ktermios *old_term
 
         /* Handle turning off CRTSCTS */
         if (old_termios->c_cflag & CRTSCTS &&
-            !(tty->termios->c_cflag & CRTSCTS)) {
+            !(tty->termios.c_cflag & CRTSCTS)) {
                 tty->hw_stopped = 0;
                 tx_release(tty);
         }
@@ -2737,6 +2737,8 @@ static void mgslpc_add_device(MGSLPC_INFO *info)
 #if SYNCLINK_GENERIC_HDLC
         hdlcdev_init(info);
 #endif
+        tty_port_register_device(&info->port, serial_driver, info->line,
+                        &info->p_dev->dev);
 }
 
 static void mgslpc_remove_device(MGSLPC_INFO *remove_info)
@@ -2750,6 +2752,7 @@ static void mgslpc_remove_device(MGSLPC_INFO *remove_info)
                                 last->next_device = info->next_device;
                         else
                                 mgslpc_device_list = info->next_device;
+                        tty_unregister_device(serial_driver, info->line);
 #if SYNCLINK_GENERIC_HDLC
                         hdlcdev_exit(info);
 #endif
@@ -2804,77 +2807,63 @@ static const struct tty_operations mgslpc_ops = {
         .proc_fops = &mgslpc_proc_fops,
 };
 
-static void synclink_cs_cleanup(void)
+static int __init synclink_cs_init(void)
 {
         int rc;
 
-        while(mgslpc_device_list)
-                mgslpc_remove_device(mgslpc_device_list);
-
-        if (serial_driver) {
-                if ((rc = tty_unregister_driver(serial_driver)))
-                        printk("%s(%d) failed to unregister tty driver err=%d\n",
-                               __FILE__,__LINE__,rc);
-                put_tty_driver(serial_driver);
+        if (break_on_load) {
+                mgslpc_get_text_ptr();
+                BREAKPOINT();
         }
 
-        pcmcia_unregister_driver(&mgslpc_driver);
-}
-
-static int __init synclink_cs_init(void)
-{
-    int rc;
-
-    if (break_on_load) {
-            mgslpc_get_text_ptr();
-            BREAKPOINT();
-    }
-
-    if ((rc = pcmcia_register_driver(&mgslpc_driver)) < 0)
-            return rc;
-
-    serial_driver = alloc_tty_driver(MAX_DEVICE_COUNT);
-    if (!serial_driver) {
-            rc = -ENOMEM;
-            goto error;
-    }
+        serial_driver = tty_alloc_driver(MAX_DEVICE_COUNT,
+                        TTY_DRIVER_REAL_RAW |
+                        TTY_DRIVER_DYNAMIC_DEV);
+        if (IS_ERR(serial_driver)) {
+                rc = PTR_ERR(serial_driver);
+                goto err;
+        }
 
-    /* Initialize the tty_driver structure */
-
-    serial_driver->driver_name = "synclink_cs";
-    serial_driver->name = "ttySLP";
-    serial_driver->major = ttymajor;
-    serial_driver->minor_start = 64;
-    serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-    serial_driver->subtype = SERIAL_TYPE_NORMAL;
-    serial_driver->init_termios = tty_std_termios;
-    serial_driver->init_termios.c_cflag =
-            B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-    serial_driver->flags = TTY_DRIVER_REAL_RAW;
-    tty_set_operations(serial_driver, &mgslpc_ops);
-
-    if ((rc = tty_register_driver(serial_driver)) < 0) {
-            printk("%s(%d):Couldn't register serial driver\n",
-                   __FILE__,__LINE__);
-            put_tty_driver(serial_driver);
-            serial_driver = NULL;
-            goto error;
-    }
+        /* Initialize the tty_driver structure */
+        serial_driver->driver_name = "synclink_cs";
+        serial_driver->name = "ttySLP";
+        serial_driver->major = ttymajor;
+        serial_driver->minor_start = 64;
+        serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
+        serial_driver->subtype = SERIAL_TYPE_NORMAL;
+        serial_driver->init_termios = tty_std_termios;
+        serial_driver->init_termios.c_cflag =
+        B9600 | CS8 | CREAD | HUPCL | CLOCAL;
+        tty_set_operations(serial_driver, &mgslpc_ops);
+
+        rc = tty_register_driver(serial_driver);
+        if (rc < 0) {
+                printk(KERN_ERR "%s(%d):Couldn't register serial driver\n",
+                                __FILE__, __LINE__);
+                goto err_put_tty;
+        }
 
-    printk("%s %s, tty major#%d\n",
-           driver_name, driver_version,
-           serial_driver->major);
+        rc = pcmcia_register_driver(&mgslpc_driver);
+        if (rc < 0)
+                goto err_unreg_tty;
 
-    return 0;
+        printk(KERN_INFO "%s %s, tty major#%d\n", driver_name, driver_version,
+                        serial_driver->major);
 
-error:
-    synclink_cs_cleanup();
-    return rc;
+        return 0;
+err_unreg_tty:
+        tty_unregister_driver(serial_driver);
+err_put_tty:
+        put_tty_driver(serial_driver);
+err:
+        return rc;
 }
 
 static void __exit synclink_cs_exit(void)
 {
-        synclink_cs_cleanup();
+        pcmcia_unregister_driver(&mgslpc_driver);
+        tty_unregister_driver(serial_driver);
+        put_tty_driver(serial_driver);
 }
 
 module_init(synclink_cs_init);
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index 46b77ede84c0..af98f6d6509b 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -67,7 +67,7 @@ static int tpk_printk(const unsigned char *buf, int count)
                                 tmp[tpk_curr + 1] = '\0';
                                 printk(KERN_INFO "%s%s", tpk_tag, tmp);
                                 tpk_curr = 0;
-                                if (buf[i + 1] == '\n')
+                                if ((i + 1) < count && buf[i + 1] == '\n')
                                         i++;
                                 break;
                         case '\n':
@@ -178,11 +178,17 @@ static struct tty_driver *ttyprintk_driver;
 static int __init ttyprintk_init(void)
 {
         int ret = -ENOMEM;
-        void *rp;
 
-        ttyprintk_driver = alloc_tty_driver(1);
-        if (!ttyprintk_driver)
-                return ret;
+        tty_port_init(&tpk_port.port);
+        tpk_port.port.ops = &null_ops;
+        mutex_init(&tpk_port.port_write_mutex);
+
+        ttyprintk_driver = tty_alloc_driver(1,
+                        TTY_DRIVER_RESET_TERMIOS |
+                        TTY_DRIVER_REAL_RAW |
+                        TTY_DRIVER_UNNUMBERED_NODE);
+        if (IS_ERR(ttyprintk_driver))
+                return PTR_ERR(ttyprintk_driver);
 
         ttyprintk_driver->driver_name = "ttyprintk";
         ttyprintk_driver->name = "ttyprintk";
@@ -191,9 +197,8 @@ static int __init ttyprintk_init(void)
         ttyprintk_driver->type = TTY_DRIVER_TYPE_CONSOLE;
         ttyprintk_driver->init_termios = tty_std_termios;
         ttyprintk_driver->init_termios.c_oflag = OPOST | OCRNL | ONOCR | ONLRET;
-        ttyprintk_driver->flags = TTY_DRIVER_RESET_TERMIOS |
-                TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
         tty_set_operations(ttyprintk_driver, &ttyprintk_ops);
+        tty_port_link_device(&tpk_port.port, ttyprintk_driver, 0);
 
         ret = tty_register_driver(ttyprintk_driver);
         if (ret < 0) {
@@ -201,22 +206,10 @@ static int __init ttyprintk_init(void)
                 goto error;
         }
 
-        /* create our unnumbered device */
-        rp = device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 3), NULL,
-                                ttyprintk_driver->name);
-        if (IS_ERR(rp)) {
-                printk(KERN_ERR "Couldn't create ttyprintk device\n");
-                ret = PTR_ERR(rp);
-                goto error;
-        }
-
-        tty_port_init(&tpk_port.port);
-        tpk_port.port.ops = &null_ops;
-        mutex_init(&tpk_port.port_write_mutex);
-
         return 0;
 
 error:
+        tty_unregister_driver(ttyprintk_driver);
         put_tty_driver(ttyprintk_driver);
         ttyprintk_driver = NULL;
         return ret;