1 files changed, 8 insertions, 14 deletions

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 2c723e8b30da..f9726f6afdf1 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -19,7 +19,6 @@
 #include <linux/param.h>
 #include <linux/seq_file.h>
 #include <linux/serial.h>
-#include <linux/serialP.h>
 
 #include <asm/uaccess.h>
 #include <asm/irq.h>
@@ -37,6 +36,7 @@
 #define SERIAL_TIMER_VALUE (20 * HZ)
 
 static struct tty_driver *serial_driver;
+static struct tty_port serial_port;
 static struct timer_list serial_timer;
 
 static DEFINE_SPINLOCK(timer_lock);
@@ -68,17 +68,10 @@ static void rs_poll(unsigned long);
 
 static int rs_open(struct tty_struct *tty, struct file * filp)
 {
-        int line = tty->index;
-
-        if ((line < 0) || (line >= SERIAL_MAX_NUM_LINES))
-                return -ENODEV;
-
+        tty->port = &serial_port;
         spin_lock(&timer_lock);
-
         if (tty->count == 1) {
-                init_timer(&serial_timer);
-                serial_timer.data = (unsigned long) tty;
-                serial_timer.function = rs_poll;
+                setup_timer(&serial_timer, rs_poll, (unsigned long)tty);
                 mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
         }
         spin_unlock(&timer_lock);
@@ -99,10 +92,10 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
  */
 static void rs_close(struct tty_struct *tty, struct file * filp)
 {
-        spin_lock(&timer_lock);
+        spin_lock_bh(&timer_lock);
         if (tty->count == 1)
                 del_timer_sync(&serial_timer);
-        spin_unlock(&timer_lock);
+        spin_unlock_bh(&timer_lock);
 }
 
 
@@ -210,13 +203,14 @@ static const struct tty_operations serial_ops = {
 
 int __init rs_init(void)
 {
-        serial_driver = alloc_tty_driver(1);
+        tty_port_init(&serial_port);
+
+        serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES);
 
         printk ("%s %s\n", serial_name, serial_version);
 
         /* Initialize the tty_driver structure */
 
-        serial_driver->owner = THIS_MODULE;
         serial_driver->driver_name = "iss_serial";
         serial_driver->name = "ttyS";
         serial_driver->major = TTY_MAJOR;