TTY: pdc_cons, use tty_port

[deliverable/linux.git] / arch / parisc / kernel / pdc_cons.c

diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c
index fc770be465ff648cb6e5d33dc883e1782531613a..4f004596a6e7ad920674fb14780c668fe015b965 100644 (file)
--- a/arch/parisc/kernel/pdc_cons.c
+++ b/arch/parisc/kernel/pdc_cons.c
@@ -90,11 +90,13 @@ static int pdc_console_setup(struct console *co, char *options)
 
 #define PDC_CONS_POLL_DELAY (30 * HZ / 1000)
 
-static struct timer_list pdc_console_timer;
+static void pdc_console_poll(unsigned long unused);
+static DEFINE_TIMER(pdc_console_timer, pdc_console_poll, 0, 0);
+static struct tty_port tty_port;
 
 static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp)
 {
-
+       tty_port_tty_set(&tty_port, tty);
        mod_timer(&pdc_console_timer, jiffies + PDC_CONS_POLL_DELAY);
 
        return 0;
@@ -102,8 +104,10 @@ static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp)
 
 static void pdc_console_tty_close(struct tty_struct *tty, struct file *filp)
 {
-       if (!tty->count)
-               del_timer(&pdc_console_timer);
+       if (!tty->count) {
+               del_timer_sync(&pdc_console_timer);
+               tty_port_tty_set(&tty_port, NULL);
+       }
 }
 
 static int pdc_console_tty_write(struct tty_struct *tty, const unsigned char *buf, int count)
@@ -122,8 +126,6 @@ static int pdc_console_tty_chars_in_buffer(struct tty_struct *tty)
        return 0; /* no buffer */
 }
 
-static struct tty_driver *pdc_console_tty_driver;
-
 static const struct tty_operations pdc_console_tty_ops = {
        .open = pdc_console_tty_open,
        .close = pdc_console_tty_close,
@@ -134,10 +136,8 @@ static const struct tty_operations pdc_console_tty_ops = {
 
 static void pdc_console_poll(unsigned long unused)
 {
-
        int data, count = 0;
-
-       struct tty_struct *tty = pdc_console_tty_driver->ttys[0];
+       struct tty_struct *tty = tty_port_tty_get(&tty_port);
 
        if (!tty)
                return;
@@ -153,15 +153,17 @@ static void pdc_console_poll(unsigned long unused)
        if (count)
                tty_flip_buffer_push(tty);
 
-       if (tty->count && (pdc_cons.flags & CON_ENABLED))
+       tty_kref_put(tty);
+
+       if (pdc_cons.flags & CON_ENABLED)
                mod_timer(&pdc_console_timer, jiffies + PDC_CONS_POLL_DELAY);
 }
 
+static struct tty_driver *pdc_console_tty_driver;
+
 static int __init pdc_console_tty_driver_init(void)
 {
-
        int err;
-       struct tty_driver *drv;
 
        /* Check if the console driver is still registered.
         * It is unregistered if the pdc console was not selected as the
@@ -183,32 +185,29 @@ static int __init pdc_console_tty_driver_init(void)
        printk(KERN_INFO "The PDC console driver is still registered, removing CON_BOOT flag\n");
        pdc_cons.flags &= ~CON_BOOT;
 
-       drv = alloc_tty_driver(1);
+       tty_port_init(&tty_port);
 
-       if (!drv)
-               return -ENOMEM;
+       pdc_console_tty_driver = alloc_tty_driver(1);
 
-       drv->driver_name = "pdc_cons";
-       drv->name = "ttyB";
-       drv->major = MUX_MAJOR;
-       drv->minor_start = 0;
-       drv->type = TTY_DRIVER_TYPE_SYSTEM;
-       drv->init_termios = tty_std_termios;
-       drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS;
-       tty_set_operations(drv, &pdc_console_tty_ops);
+       if (!pdc_console_tty_driver)
+               return -ENOMEM;
 
-       err = tty_register_driver(drv);
+       pdc_console_tty_driver->driver_name = "pdc_cons";
+       pdc_console_tty_driver->name = "ttyB";
+       pdc_console_tty_driver->major = MUX_MAJOR;
+       pdc_console_tty_driver->minor_start = 0;
+       pdc_console_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM;
+       pdc_console_tty_driver->init_termios = tty_std_termios;
+       pdc_console_tty_driver->flags = TTY_DRIVER_REAL_RAW |
+               TTY_DRIVER_RESET_TERMIOS;
+       tty_set_operations(pdc_console_tty_driver, &pdc_console_tty_ops);
+
+       err = tty_register_driver(pdc_console_tty_driver);
        if (err) {
                printk(KERN_ERR "Unable to register the PDC console TTY driver\n");
                return err;
        }
 
-       pdc_console_tty_driver = drv;
-
-       /* No need to initialize the pdc_console_timer if tty isn't allocated */
-       init_timer(&pdc_console_timer);
-       pdc_console_timer.function = pdc_console_poll;
-
        return 0;
 }