92 files changed, 2795 insertions, 2299 deletions
diff --git a/drivers/accessibility/braille/braille_console.c b/drivers/accessibility/braille/braille_console.c
index c339a0880e6e..d21167bfc865 100644
--- a/drivers/accessibility/braille/braille_console.c
+++ b/drivers/accessibility/braille/braille_console.c
@@ -244,16 +244,13 @@ static int keyboard_notifier_call(struct notifier_block *blk,
                        switch (val) {
                        case KVAL(K_CAPS):
-                                on_off = vc_kbd_led(kbd_table + fg_console,
+                                on_off = vt_get_leds(fg_console, VC_CAPSLOCK);
-                                                VC_CAPSLOCK);
                                break;
                        case KVAL(K_NUM):
-                                on_off = vc_kbd_led(kbd_table + fg_console,
+                                on_off = vt_get_leds(fg_console, VC_NUMLOCK);
-                                                VC_NUMLOCK);
                                break;
                        case KVAL(K_HOLD):
-                                on_off = vc_kbd_led(kbd_table + fg_console,
+                                on_off = vt_get_leds(fg_console, VC_SCROLLOCK);
-                                                VC_SCROLLOCK);
                                break;
                        }
                        if (on_off == 1)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 43643033a3ae..ee946865d6cb 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -66,21 +66,6 @@ config TTY_PRINTK
          If unsure, say N.
-config BRIQ_PANEL
-        tristate 'Total Impact briQ front panel driver'
-        depends on PPC_CHRP
-        ---help---
-          The briQ is a small footprint CHRP computer with a frontpanel VFD, a
-          tristate led and two switches. It is the size of a CDROM drive.
-          If you have such one and want anything showing on the VFD then you
-          must answer Y here.
-          To compile this driver as a module, choose M here: the
-          module will be called briq_panel.
-          It's safe to say N here.
 config BFIN_OTP
        tristate "Blackfin On-Chip OTP Memory Support"
        depends on BLACKFIN && (BF51x || BF52x || BF54x)
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 32762ba769c2..0dc5d7ce4864 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_UV_MMTIMER)	+= uv_mmtimer.o
 obj-$(CONFIG_VIOTAPE)           += viotape.o
 obj-$(CONFIG_IBM_BSR)           += bsr.o
 obj-$(CONFIG_SGI_MBCS)          += mbcs.o
-obj-$(CONFIG_BRIQ_PANEL)        += briq_panel.o
 obj-$(CONFIG_BFIN_OTP)          += bfin-otp.o
 obj-$(CONFIG_PRINTER)           += lp.o
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
deleted file mode 100644
index 095ab90535ce..000000000000
--- a/drivers/char/briq_panel.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Drivers for the Total Impact PPC based computer "BRIQ"
- * by Dr. Karsten Jeppesen
- *
- */
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/timer.h>
-#include <linux/kernel.h>
-#include <linux/wait.h>
-#include <linux/string.h>
-#include <linux/ioport.h>
-#include <linux/delay.h>
-#include <linux/miscdevice.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-#define         BRIQ_PANEL_MINOR        156
-#define         BRIQ_PANEL_VFD_IOPORT   0x0390
-#define         BRIQ_PANEL_LED_IOPORT   0x0398
-#define         BRIQ_PANEL_VER          "1.1 (04/20/2002)"
-#define         BRIQ_PANEL_MSG0         "Loading Linux"
-static int              vfd_is_open;
-static unsigned char    vfd[40];
-static int              vfd_cursor;
-static unsigned char    ledpb, led;
-static void update_vfd(void)
-{
-        int     i;
-        /* cursor home */
-        outb(0x02, BRIQ_PANEL_VFD_IOPORT);
-        for (i=0; i<20; i++)
-                outb(vfd[i], BRIQ_PANEL_VFD_IOPORT + 1);
-        /* cursor to next line */
-        outb(0xc0, BRIQ_PANEL_VFD_IOPORT);
-        for (i=20; i<40; i++)
-                outb(vfd[i], BRIQ_PANEL_VFD_IOPORT + 1);
-}
-static void set_led(char state)
-{
-        if (state == 'R')
-                led = 0x01;
-        else if (state == 'G')
-                led = 0x02;
-        else if (state == 'Y')
-                led = 0x03;
-        else if (state == 'X')
-                led = 0x00;
-        outb(led, BRIQ_PANEL_LED_IOPORT);
-}
-static int briq_panel_open(struct inode *ino, struct file *filep)
-{
-        tty_lock();
-        /* enforce single access, vfd_is_open is protected by BKL */
-        if (vfd_is_open) {
-                tty_unlock();
-                return -EBUSY;
-        }
-        vfd_is_open = 1;
-        tty_unlock();
-        return 0;
-}
-static int briq_panel_release(struct inode *ino, struct file *filep)
-{
-        if (!vfd_is_open)
-                return -ENODEV;
-        vfd_is_open = 0;
-        return 0;
-}
-static ssize_t briq_panel_read(struct file *file, char __user *buf, size_t count,
-                         loff_t *ppos)
-{
-        unsigned short c;
-        unsigned char cp;
-        if (!vfd_is_open)
-                return -ENODEV;
-        c = (inb(BRIQ_PANEL_LED_IOPORT) & 0x000c) | (ledpb & 0x0003);
-        set_led(' ');
-        /* upper button released */
-        if ((!(ledpb & 0x0004)) && (c & 0x0004)) {
-                cp = ' ';
-                ledpb = c;
-                if (copy_to_user(buf, &cp, 1))
-                        return -EFAULT;
-                return 1;
-        }
-        /* lower button released */
-        else if ((!(ledpb & 0x0008)) && (c & 0x0008)) {
-                cp = '\r';
-                ledpb = c;
-                if (copy_to_user(buf, &cp, 1))
-                        return -EFAULT;
-                return 1;
-        } else {
-                ledpb = c;
-                return 0;
-        }
-}
-static void scroll_vfd( void )
-{
-        int     i;
-        for (i=0; i<20; i++) {
-                vfd[i] = vfd[i+20];
-                vfd[i+20] = ' ';
-        }
-        vfd_cursor = 20;
-}
-static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_t len,
-                          loff_t *ppos)
-{
-        size_t indx = len;
-        int i, esc = 0;
-        if (!vfd_is_open)
-                return -EBUSY;
-        for (;;) {
-                char c;
-                if (!indx)
-                        break;
-                if (get_user(c, buf))
-                        return -EFAULT;
-                if (esc) {
-                        set_led(c);
-                        esc = 0;
-                } else if (c == 27) {
-                        esc = 1;
-                } else if (c == 12) {
-                        /* do a form feed */
-                        for (i=0; i<40; i++)
-                                vfd[i] = ' ';
-                        vfd_cursor = 0;
-                } else if (c == 10) {
-                        if (vfd_cursor < 20)
-                                vfd_cursor = 20;
-                        else if (vfd_cursor < 40)
-                                vfd_cursor = 40;
-                        else if (vfd_cursor < 60)
-                                vfd_cursor = 60;
-                        if (vfd_cursor > 59)
-                                scroll_vfd();
-                } else {
-                        /* just a character */
-                        if (vfd_cursor > 39)
-                                scroll_vfd();
-                        vfd[vfd_cursor++] = c;
-                }
-                indx--;
-                buf++;
-        }
-        update_vfd();
-        return len;
-}
-static const struct file_operations briq_panel_fops = {
-        .owner          = THIS_MODULE,
-        .read           = briq_panel_read,
-        .write          = briq_panel_write,
-        .open           = briq_panel_open,
-        .release        = briq_panel_release,
-        .llseek         = noop_llseek,
-};
-static struct miscdevice briq_panel_miscdev = {
-        BRIQ_PANEL_MINOR,
-        "briq_panel",
-        &briq_panel_fops
-};
-static int __init briq_panel_init(void)
-{
-        struct device_node *root = of_find_node_by_path("/");
-        const char *machine;
-        int i;
-        machine = of_get_property(root, "model", NULL);
-        if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) {
-                of_node_put(root);
-                return -ENODEV;
-        }
-        of_node_put(root);
-        printk(KERN_INFO
-                "briq_panel: v%s Dr. Karsten Jeppesen (kj@totalimpact.com)\n",
-                BRIQ_PANEL_VER);
-        if (!request_region(BRIQ_PANEL_VFD_IOPORT, 4, "BRIQ Front Panel"))
-                return -EBUSY;
-        if (!request_region(BRIQ_PANEL_LED_IOPORT, 2, "BRIQ Front Panel")) {
-                release_region(BRIQ_PANEL_VFD_IOPORT, 4);
-                return -EBUSY;
-        }
-        ledpb = inb(BRIQ_PANEL_LED_IOPORT) & 0x000c;
-        if (misc_register(&briq_panel_miscdev) < 0) {
-                release_region(BRIQ_PANEL_VFD_IOPORT, 4);
-                release_region(BRIQ_PANEL_LED_IOPORT, 2);
-                return -EBUSY;
-        }
-        outb(0x38, BRIQ_PANEL_VFD_IOPORT);      /* Function set */
-        outb(0x01, BRIQ_PANEL_VFD_IOPORT);      /* Clear display */
-        outb(0x0c, BRIQ_PANEL_VFD_IOPORT);      /* Display on */
-        outb(0x06, BRIQ_PANEL_VFD_IOPORT);      /* Entry normal */
-        for (i=0; i<40; i++)
-                vfd[i]=' ';
-#ifndef MODULE
-        vfd[0] = 'L';
-        vfd[1] = 'o';
-        vfd[2] = 'a';
-        vfd[3] = 'd';
-        vfd[4] = 'i';
-        vfd[5] = 'n';
-        vfd[6] = 'g';
-        vfd[7] = ' ';
-        vfd[8] = '.';
-        vfd[9] = '.';
-        vfd[10] = '.';
-#endif /* !MODULE */
-        update_vfd();
-        return 0;
-}
-static void __exit briq_panel_exit(void)
-{
-        misc_deregister(&briq_panel_miscdev);
-        release_region(BRIQ_PANEL_VFD_IOPORT, 4);
-        release_region(BRIQ_PANEL_LED_IOPORT, 2);
-}
-module_init(briq_panel_init);
-module_exit(briq_panel_exit);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Karsten Jeppesen <karsten@jeppesens.com>");
-MODULE_DESCRIPTION("Driver for the Total Impact briQ front panel");
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 07f6a5abe372..f6453df4921c 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2484,7 +2484,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
        /* verify range of specified line number */
        line = tty->index;
-        if ((line < 0) || (line >= mgslpc_device_count)) {
+        if (line >= mgslpc_device_count) {
                printk("%s(%d):mgslpc_open with invalid line #%d.\n",
                        __FILE__,__LINE__,line);
                return -ENODEV;
@@ -2836,7 +2836,6 @@ static int __init synclink_cs_init(void)
    /* Initialize the tty_driver structure */
-    serial_driver->owner = THIS_MODULE;
    serial_driver->driver_name = "synclink_cs";
    serial_driver->name = "ttySLP";
    serial_driver->major = ttymajor;
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index eedd5474850c..46b77ede84c0 100644
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -184,12 +184,10 @@ static int __init ttyprintk_init(void)
        if (!ttyprintk_driver)
                return ret;
-        ttyprintk_driver->owner = THIS_MODULE;
        ttyprintk_driver->driver_name = "ttyprintk";
        ttyprintk_driver->name = "ttyprintk";
        ttyprintk_driver->major = TTYAUX_MAJOR;
        ttyprintk_driver->minor_start = 3;
-        ttyprintk_driver->num = 1;
        ttyprintk_driver->type = TTY_DRIVER_TYPE_CONSOLE;
        ttyprintk_driver->init_termios = tty_std_termios;
        ttyprintk_driver->init_termios.c_oflag = OPOST | OCRNL | ONOCR | ONLRET;
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index e44933d58790..3a7905b06e53 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1013,16 +1013,12 @@ static const struct file_operations capi_fops =
 static int
 capinc_tty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
-        int idx = tty->index;
+        struct capiminor *mp = capiminor_get(tty->index);
-        struct capiminor *mp = capiminor_get(idx);
+        int ret = tty_standard_install(driver, tty);
-        int ret = tty_init_termios(tty);
-        if (ret == 0) {
+        if (ret == 0)
-                tty_driver_kref_get(driver);
-                tty->count++;
                tty->driver_data = mp;
-                driver->ttys[idx] = tty;
+        else
-        } else
                capiminor_put(mp);
        return ret;
 }
@@ -1290,7 +1286,6 @@ static int __init capinc_tty_init(void)
                kfree(capiminors);
                return -ENOMEM;
        }
-        drv->owner = THIS_MODULE;
        drv->driver_name = "capi_nc";
        drv->name = "capi";
        drv->major = 0;
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index db621db67f61..880f6ef0e18d 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -720,12 +720,11 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
        tasklet_init(&cs->event_tasklet, gigaset_handle_event,
                     (unsigned long) cs);
+        tty_port_init(&cs->port);
        cs->commands_pending = 0;
        cs->cur_at_seq = 0;
        cs->gotfwver = -1;
-        cs->open_count = 0;
        cs->dev = NULL;
-        cs->tty = NULL;
        cs->tty_dev = NULL;
        cs->cidmode = cidmode != 0;
        cs->tabnocid = gigaset_tab_nocid;
@@ -1051,8 +1050,6 @@ static struct cardstate *gigaset_get_cs_by_minor(unsigned minor)
 struct cardstate *gigaset_get_cs_by_tty(struct tty_struct *tty)
 {
-        if (tty->index < 0 || tty->index >= tty->driver->num)
-                return NULL;
        return gigaset_get_cs_by_minor(tty->index + tty->driver->minor_start);
 }
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 212efaf9a4e4..f877726d664b 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -433,8 +433,7 @@ struct cardstate {
        spinlock_t cmdlock;
        unsigned curlen, cmdbytes;
-        unsigned open_count;
+        struct tty_port port;
-        struct tty_struct *tty;
        struct tasklet_struct if_wake_tasklet;
        unsigned control_state;
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index ee0a549a933a..8f8814afce86 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -146,13 +146,10 @@ static const struct tty_operations if_ops = {
 static int if_open(struct tty_struct *tty, struct file *filp)
 {
        struct cardstate *cs;
-        unsigned long flags;
        gig_dbg(DEBUG_IF, "%d+%d: %s()",
                tty->driver->minor_start, tty->index, __func__);
-        tty->driver_data = NULL;
        cs = gigaset_get_cs_by_tty(tty);
        if (!cs || !try_module_get(cs->driver->owner))
                return -ENODEV;
@@ -163,12 +160,10 @@ static int if_open(struct tty_struct *tty, struct file *filp)
        }
        tty->driver_data = cs;
-        ++cs->open_count;
+        ++cs->port.count;
-        if (cs->open_count == 1) {
+        if (cs->port.count == 1) {
-                spin_lock_irqsave(&cs->lock, flags);
+                tty_port_tty_set(&cs->port, tty);
-                cs->tty = tty;
-                spin_unlock_irqrestore(&cs->lock, flags);
                tty->low_latency = 1;
        }
@@ -178,12 +173,10 @@ static int if_open(struct tty_struct *tty, struct file *filp)
 static void if_close(struct tty_struct *tty, struct file *filp)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
-        unsigned long flags;
-        cs = (struct cardstate *) tty->driver_data;
+        if (!cs) { /* happens if we didn't find cs in open */
-        if (!cs) {
+                printk(KERN_DEBUG "%s: no cardstate\n", __func__);
-                pr_err("%s: no cardstate\n", __func__);
                return;
        }
@@ -193,15 +186,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
        if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
-        else if (!cs->open_count)
+        else if (!cs->port.count)
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-        else {
+        else if (!--cs->port.count)
-                if (!--cs->open_count) {
+                tty_port_tty_set(&cs->port, NULL);
-                        spin_lock_irqsave(&cs->lock, flags);
-                        cs->tty = NULL;
-                        spin_unlock_irqrestore(&cs->lock, flags);
-                }
-        }
        mutex_unlock(&cs->mutex);
@@ -211,18 +199,12 @@ static void if_close(struct tty_struct *tty, struct file *filp)
 static int if_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
        int retval = -ENODEV;
        int int_arg;
        unsigned char buf[6];
        unsigned version[4];
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
        gig_dbg(DEBUG_IF, "%u: %s(0x%x)", cs->minor_index, __func__, cmd);
        if (mutex_lock_interruptible(&cs->mutex))
@@ -231,9 +213,7 @@ static int if_ioctl(struct tty_struct *tty,
        if (!cs->connected) {
                gig_dbg(DEBUG_IF, "not connected");
                retval = -ENODEV;
-        } else if (!cs->open_count)
+        } else {
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-        else {
                retval = 0;
                switch (cmd) {
                case GIGASET_REDIR:
@@ -285,15 +265,9 @@ static int if_ioctl(struct tty_struct *tty,
 static int if_tiocmget(struct tty_struct *tty)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
        int retval;
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
        if (mutex_lock_interruptible(&cs->mutex))
@@ -309,16 +283,10 @@ static int if_tiocmget(struct tty_struct *tty)
 static int if_tiocmset(struct tty_struct *tty,
                       unsigned int set, unsigned int clear)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
        int retval;
        unsigned mc;
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
        gig_dbg(DEBUG_IF, "%u: %s(0x%x, 0x%x)",
                cs->minor_index, __func__, set, clear);
@@ -341,16 +309,10 @@ static int if_tiocmset(struct tty_struct *tty,
 static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
        struct cmdbuf_t *cb;
        int retval;
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
        if (mutex_lock_interruptible(&cs->mutex))
@@ -361,11 +323,6 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
                retval = -ENODEV;
                goto done;
        }
-        if (!cs->open_count) {
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-                retval = -ENODEV;
-                goto done;
-        }
        if (cs->mstate != MS_LOCKED) {
                dev_warn(cs->dev, "can't write to unlocked device\n");
                retval = -EBUSY;
@@ -397,15 +354,9 @@ done:
 static int if_write_room(struct tty_struct *tty)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
        int retval = -ENODEV;
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return -ENODEV;
-        }
        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
        if (mutex_lock_interruptible(&cs->mutex))
@@ -414,9 +365,7 @@ static int if_write_room(struct tty_struct *tty)
        if (!cs->connected) {
                gig_dbg(DEBUG_IF, "not connected");
                retval = -ENODEV;
-        } else if (!cs->open_count)
+        } else if (cs->mstate != MS_LOCKED) {
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-        else if (cs->mstate != MS_LOCKED) {
                dev_warn(cs->dev, "can't write to unlocked device\n");
                retval = -EBUSY;
        } else
@@ -429,23 +378,15 @@ static int if_write_room(struct tty_struct *tty)
 static int if_chars_in_buffer(struct tty_struct *tty)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
        int retval = 0;
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return 0;
-        }
        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
        mutex_lock(&cs->mutex);
        if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");
-        else if (!cs->open_count)
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else if (cs->mstate != MS_LOCKED)
                dev_warn(cs->dev, "can't write to unlocked device\n");
        else
@@ -458,13 +399,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
 static void if_throttle(struct tty_struct *tty)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return;
-        }
        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
@@ -472,8 +407,6 @@ static void if_throttle(struct tty_struct *tty)
        if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
-        else if (!cs->open_count)
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else
                gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
@@ -482,13 +415,7 @@ static void if_throttle(struct tty_struct *tty)
 static void if_unthrottle(struct tty_struct *tty)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return;
-        }
        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
@@ -496,8 +423,6 @@ static void if_unthrottle(struct tty_struct *tty)
        if (!cs->connected)
                gig_dbg(DEBUG_IF, "not connected");     /* nothing to do */
-        else if (!cs->open_count)
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
        else
                gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
@@ -506,18 +431,12 @@ static void if_unthrottle(struct tty_struct *tty)
 static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
-        struct cardstate *cs;
+        struct cardstate *cs = tty->driver_data;
        unsigned int iflag;
        unsigned int cflag;
        unsigned int old_cflag;
        unsigned int control_state, new_state;
-        cs = (struct cardstate *) tty->driver_data;
-        if (!cs) {
-                pr_err("%s: no cardstate\n", __func__);
-                return;
-        }
        gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
        mutex_lock(&cs->mutex);
@@ -527,11 +446,6 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
                goto out;
        }
-        if (!cs->open_count) {
-                dev_warn(cs->dev, "%s: device not opened\n", __func__);
-                goto out;
-        }
        iflag = tty->termios->c_iflag;
        cflag = tty->termios->c_cflag;
        old_cflag = old ? old->c_cflag : cflag;
@@ -588,10 +502,13 @@ out:
 /* wakeup tasklet for the write operation */
 static void if_wake(unsigned long data)
 {
-        struct cardstate *cs = (struct cardstate *) data;
+        struct cardstate *cs = (struct cardstate *)data;
+        struct tty_struct *tty = tty_port_tty_get(&cs->port);
-        if (cs->tty)
+        if (tty) {
-                tty_wakeup(cs->tty);
+                tty_wakeup(tty);
+                tty_kref_put(tty);
+        }
 }
 /*** interface to common ***/
@@ -644,18 +561,16 @@ void gigaset_if_free(struct cardstate *cs)
 void gigaset_if_receive(struct cardstate *cs,
                        unsigned char *buffer, size_t len)
 {
-        unsigned long flags;
+        struct tty_struct *tty = tty_port_tty_get(&cs->port);
-        struct tty_struct *tty;
-        spin_lock_irqsave(&cs->lock, flags);
+        if (tty == NULL) {
-        tty = cs->tty;
-        if (tty == NULL)
                gig_dbg(DEBUG_IF, "receive on closed device");
-        else {
+                return;
-                tty_insert_flip_string(tty, buffer, len);
-                tty_flip_buffer_push(tty);
        }
-        spin_unlock_irqrestore(&cs->lock, flags);
+        tty_insert_flip_string(tty, buffer, len);
+        tty_flip_buffer_push(tty);
+        tty_kref_put(tty);
 }
 EXPORT_SYMBOL_GPL(gigaset_if_receive);
@@ -669,17 +584,15 @@ EXPORT_SYMBOL_GPL(gigaset_if_receive);
 void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
                           const char *devname)
 {
-        unsigned minors = drv->minors;
        int ret;
        struct tty_driver *tty;
        drv->have_tty = 0;
-        drv->tty = tty = alloc_tty_driver(minors);
+        drv->tty = tty = alloc_tty_driver(drv->minors);
        if (tty == NULL)
                goto enomem;
-        tty->magic =            TTY_DRIVER_MAGIC,
        tty->type =             TTY_DRIVER_TYPE_SERIAL,
        tty->subtype =          SERIAL_TYPE_NORMAL,
        tty->flags =            TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
@@ -687,9 +600,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
        tty->driver_name =      procname;
        tty->name =             devname;
        tty->minor_start =      drv->minor;
-        tty->num =              drv->minors;
-        tty->owner =            THIS_MODULE;
        tty->init_termios          = tty_std_termios;
        tty->init_termios.c_cflag  = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 2c26b64ebbea..ac4840124bc0 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1590,12 +1590,9 @@ static int
 isdn_tty_open(struct tty_struct *tty, struct file *filp)
 {
        modem_info *info;
-        int retval, line;
+        int retval;
-        line = tty->index;
+        info = &dev->mdm.info[tty->index];
-        if (line < 0 || line >= ISDN_MAX_CHANNELS)
-                return -ENODEV;
-        info = &dev->mdm.info[line];
        if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_open"))
                return -ENODEV;
        if (!try_module_get(info->owner)) {
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 0b56e3f43573..383133b201a1 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -481,13 +481,9 @@ static int pti_tty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
        int idx = tty->index;
        struct pti_tty *pti_tty_data;
-        int ret = tty_init_termios(tty);
+        int ret = tty_standard_install(driver, tty);
        if (ret == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
-                driver->ttys[idx] = tty;
                pti_tty_data = kmalloc(sizeof(struct pti_tty), GFP_KERNEL);
                if (pti_tty_data == NULL)
                        return -ENOMEM;
@@ -911,21 +907,17 @@ static int __init pti_init(void)
        /* First register module as tty device */
-        pti_tty_driver = alloc_tty_driver(1);
+        pti_tty_driver = alloc_tty_driver(PTITTY_MINOR_NUM);
        if (pti_tty_driver == NULL) {
                pr_err("%s(%d): Memory allocation failed for ptiTTY driver\n",
                        __func__, __LINE__);
                return -ENOMEM;
        }
-        pti_tty_driver->owner                   = THIS_MODULE;
-        pti_tty_driver->magic                   = TTY_DRIVER_MAGIC;
        pti_tty_driver->driver_name             = DRIVERNAME;
        pti_tty_driver->name                    = TTYNAME;
        pti_tty_driver->major                   = 0;
        pti_tty_driver->minor_start             = PTITTY_MINOR_START;
-        pti_tty_driver->minor_num               = PTITTY_MINOR_NUM;
-        pti_tty_driver->num                     = PTITTY_MINOR_NUM;
        pti_tty_driver->type                    = TTY_DRIVER_TYPE_SYSTEM;
        pti_tty_driver->subtype                 = SYSTEM_TYPE_SYSCONS;
        pti_tty_driver->flags                   = TTY_DRIVER_REAL_RAW |
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index 2c151e18c9e8..5a2cbfac66d2 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -750,15 +750,12 @@ static int sdio_uart_install(struct tty_driver *driver, struct tty_struct *tty)
 {
        int idx = tty->index;
        struct sdio_uart_port *port = sdio_uart_port_get(idx);
-        int ret = tty_init_termios(tty);
+        int ret = tty_standard_install(driver, tty);
-        if (ret == 0) {
+        if (ret == 0)
-                tty_driver_kref_get(driver);
-                tty->count++;
                /* This is the ref sdio_uart_port get provided */
                tty->driver_data = port;
-                driver->ttys[idx] = tty;
+        else
-        } else
                sdio_uart_port_put(port);
        return ret;
 }
@@ -1178,7 +1175,6 @@ static int __init sdio_uart_init(void)
        if (!tty_drv)
                return -ENOMEM;
-        tty_drv->owner = THIS_MODULE;
        tty_drv->driver_name = "sdio_uart";
        tty_drv->name =   "ttySDIO";
        tty_drv->major = 0;  /* dynamically allocated */
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index e1324b4a0f66..2d2a6882ba33 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -3313,7 +3313,6 @@ static int __init hso_init(void)
        /* fill in all needed values */
        tty_drv->magic = TTY_DRIVER_MAGIC;
-        tty_drv->owner = THIS_MODULE;
        tty_drv->driver_name = driver_name;
        tty_drv->name = tty_filename;
@@ -3322,7 +3321,6 @@ static int __init hso_init(void)
                tty_drv->major = tty_major;
        tty_drv->minor_start = 0;
-        tty_drv->num = HSO_SERIAL_TTY_MINORS;
        tty_drv->type = TTY_DRIVER_TYPE_SERIAL;
        tty_drv->subtype = SERIAL_TYPE_NORMAL;
        tty_drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 1eeedd6a10b1..cb0f8d932b0c 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -299,7 +299,6 @@ void cpc_tty_init(pc300dev_t * dev);
 void cpc_tty_unregister_service(pc300dev_t * pc300dev);
 void cpc_tty_receive(pc300dev_t * pc300dev);
 void cpc_tty_trigger_poll(pc300dev_t * pc300dev);
-void cpc_tty_reset_var(void);
 #endif
 /************************/
@@ -3232,7 +3231,7 @@ static void plx_init(pc300_t * card)
 }
-static inline void show_version(void)
+static void show_version(void)
 {
        char *rcsvers, *rcsdate, *tmp;
@@ -3413,19 +3412,10 @@ static void cpc_init_card(pc300_t * card)
 static int __devinit
 cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-        static int first_time = 1;
        int err, eeprom_outdated = 0;
        u16 device_id;
        pc300_t *card;
-        if (first_time) {
-                first_time = 0;
-                show_version();
-#ifdef CONFIG_PC300_MLPPP
-                cpc_tty_reset_var();
-#endif
-        }
        if ((err = pci_enable_device(pdev)) < 0)
                return err;
@@ -3661,6 +3651,7 @@ static struct pci_driver cpc_driver = {
 static int __init cpc_init(void)
 {
+        show_version();
        return pci_register_driver(&cpc_driver);
 }
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index d47d2cd10475..4709f4228561 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -139,7 +139,6 @@ void cpc_tty_init(pc300dev_t *dev);
 void cpc_tty_unregister_service(pc300dev_t *pc300dev);
 void cpc_tty_receive(pc300dev_t *pc300dev);
 void cpc_tty_trigger_poll(pc300dev_t *pc300dev);
-void cpc_tty_reset_var(void);
 /*
 * PC300 TTY clear "signal"
@@ -1078,20 +1077,3 @@ void cpc_tty_trigger_poll(pc300dev_t *pc300dev)
        }
        schedule_work(&(cpc_tty->tty_tx_work)); 
 } 
-/*
- * PC300 TTY reset var routine
- * This routine is called by pc300driver to init the TTY area. 
- */
-void cpc_tty_reset_var(void)
-{
-        int i ; 
-        CPC_TTY_DBG("hdlcX-tty: reset variables\n");
-        /* reset  the tty_driver structure - serial_drv */ 
-        memset(&serial_drv, 0, sizeof(struct tty_driver));
-        for (i=0; i < CPC_TTY_NPORTS; i++){
-                memset(&cpc_tty_area[i],0, sizeof(st_cpc_tty_area)); 
-        }
-}
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index e71a50d4b221..4f9f1dcc1551 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -933,13 +933,9 @@ console_initcall(con3215_init);
 static int tty3215_open(struct tty_struct *tty, struct file * filp)
 {
        struct raw3215_info *raw;
-        int retval, line;
+        int retval;
-        line = tty->index;
+        raw = raw3215[tty->index];
-        if ((line < 0) || (line >= NR_3215))
-                return -ENODEV;
-        raw = raw3215[line];
        if (raw == NULL)
                return -ENODEV;
@@ -1145,7 +1141,6 @@ static int __init tty3215_init(void)
         * proc_entry, set_termios, flush_buffer, set_ldisc, write_proc
         */
-        driver->owner = THIS_MODULE;
        driver->driver_name = "tty3215";
        driver->name = "ttyS";
        driver->major = TTY_MAJOR;
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index a879c139926a..40a9d69c898e 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -551,7 +551,6 @@ sclp_tty_init(void)
                return rc;
        }
-        driver->owner = THIS_MODULE;
        driver->driver_name = "sclp_line";
        driver->name = "sclp_line";
        driver->major = TTY_MAJOR;
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index 5d706e6c946f..b635472ae660 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -685,7 +685,6 @@ static int __init sclp_vt220_tty_init(void)
        if (rc)
                goto out_driver;
-        driver->owner = THIS_MODULE;
        driver->driver_name = SCLP_VT220_DRIVER_NAME;
        driver->name = SCLP_VT220_DEVICE_NAME;
        driver->major = SCLP_VT220_MAJOR;
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 2db1482b406e..b43445a55cb6 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -1784,7 +1784,6 @@ static int __init tty3270_init(void)
         * Entries in tty3270_driver that are NOT initialized:
         * proc_entry, set_termios, flush_buffer, set_ldisc, write_proc
         */
-        driver->owner = THIS_MODULE;
        driver->driver_name = "ttyTUB";
        driver->name = "ttyTUB";
        driver->major = IBM_TTY3270_MAJOR;
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index c7b03f0ef2dd..92b34e29ad06 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -1731,15 +1731,15 @@ static void do_handle_spec(struct vc_data *vc, u_char value, char up_flag)
        switch (value) {
        case KVAL(K_CAPS):
                label = msg_get(MSG_KEYNAME_CAPSLOCK);
-                on_off = (vc_kbd_led(kbd_table + vc->vc_num, VC_CAPSLOCK));
+                on_off = vt_get_leds(fg_console, VC_CAPSLOCK);
                break;
        case KVAL(K_NUM):
                label = msg_get(MSG_KEYNAME_NUMLOCK);
-                on_off = (vc_kbd_led(kbd_table + vc->vc_num, VC_NUMLOCK));
+                on_off = vt_get_leds(fg_console, VC_NUMLOCK);
                break;
        case KVAL(K_HOLD):
                label = msg_get(MSG_KEYNAME_SCROLLLOCK);
-                on_off = (vc_kbd_led(kbd_table + vc->vc_num, VC_SCROLLOCK));
+                on_off = vt_get_leds(fg_console, VC_SCROLLOCK);
                if (speakup_console[vc->vc_num])
                        speakup_console[vc->vc_num]->tty_stopped = on_off;
                break;
@@ -2020,7 +2020,7 @@ speakup_key(struct vc_data *vc, int shift_state, int keycode, u_short keysym,
        if (type >= 0xf0)
                type -= 0xf0;
        if (type == KT_PAD
-                && (vc_kbd_led(kbd_table + fg_console, VC_NUMLOCK))) {
+                && (vt_get_leds(fg_console, VC_NUMLOCK))) {
                if (up_flag) {
                        spk_keydown = 0;
                        goto out;
diff --git a/drivers/staging/speakup/serialio.c b/drivers/staging/speakup/serialio.c
index 7f3d87bf5927..a97d3d5b58a4 100644
--- a/drivers/staging/speakup/serialio.c
+++ b/drivers/staging/speakup/serialio.c
@@ -8,21 +8,20 @@
 static void start_serial_interrupt(int irq);
-static struct serial_state rs_table[] = {
+static const struct old_serial_port rs_table[] = {
        SERIAL_PORT_DFNS
 };
-static struct serial_state *serstate;
+static const struct old_serial_port *serstate;
 static int timeouts;
-struct serial_state *spk_serial_init(int index)
+const struct old_serial_port *spk_serial_init(int index)
 {
        int baud = 9600, quot = 0;
        unsigned int cval = 0;
        int cflag = CREAD | HUPCL | CLOCAL | B9600 | CS8;
-        struct serial_state *ser = NULL;
+        const struct old_serial_port *ser = rs_table + index;
        int err;
-        ser = rs_table + index;
        /*      Divisor, bytesize and parity */
        quot = ser->baud_base / baud;
        cval = cflag & (CSIZE | CSTOPB);
@@ -41,7 +40,7 @@ struct serial_state *spk_serial_init(int index)
                __release_region(&ioport_resource, ser->port, 8);
                err = synth_request_region(ser->port, 8);
                if (err) {
-                        pr_warn("Unable to allocate port at %lx, errno %i",
+                        pr_warn("Unable to allocate port at %x, errno %i",
                                ser->port, err);
                        return NULL;
                }
diff --git a/drivers/staging/speakup/serialio.h b/drivers/staging/speakup/serialio.h
index d785b1f6a3b3..614271f9b99f 100644
--- a/drivers/staging/speakup/serialio.h
+++ b/drivers/staging/speakup/serialio.h
@@ -4,11 +4,22 @@
 #include <linux/serial.h>       /* for rs_table, serial constants &
                                   serial_uart_config */
 #include <linux/serial_reg.h>   /* for more serial constants */
-#include <linux/serialP.h>      /* for struct serial_state */
 #ifndef __sparc__
 #include <asm/serial.h>
 #endif
+/*
+ * this is cut&paste from 8250.h. Get rid of the structure, the definitions
+ * and this whole broken driver.
+ */
+struct old_serial_port {
+        unsigned int uart; /* unused */
+        unsigned int baud_base;
+        unsigned int port;
+        unsigned int irq;
+        unsigned int flags; /* unused */
+};
 /* countdown values for serial timeouts in us */
 #define SPK_SERIAL_TIMEOUT 100000
 /* countdown values transmitter/dsr timeouts in us */
diff --git a/drivers/staging/speakup/spk_priv.h b/drivers/staging/speakup/spk_priv.h
index 16ace4af68a9..a47c5b78d57d 100644
--- a/drivers/staging/speakup/spk_priv.h
+++ b/drivers/staging/speakup/spk_priv.h
@@ -44,7 +44,7 @@
 #define KT_SPKUP 15
-extern struct serial_state *spk_serial_init(int index);
+extern const struct old_serial_port *spk_serial_init(int index);
 extern void stop_serial_interrupt(void);
 extern int wait_for_xmitr(void);
 extern unsigned char spk_serial_in(void);
diff --git a/drivers/staging/speakup/synth.c b/drivers/staging/speakup/synth.c
index 2222d6919ef5..331eae788700 100644
--- a/drivers/staging/speakup/synth.c
+++ b/drivers/staging/speakup/synth.c
@@ -34,7 +34,7 @@ static int do_synth_init(struct spk_synth *in_synth);
 int serial_synth_probe(struct spk_synth *synth)
 {
-        struct serial_state *ser;
+        const struct old_serial_port *ser;
        int failed = 0;
        if ((synth->ser >= SPK_LO_TTY) && (synth->ser <= SPK_HI_TTY)) {
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index b84c83456dcc..afadcd43d14e 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -45,7 +45,7 @@
 #if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT)
 #define DBG_CNT(s) printk("(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \
- tty->name, (info->flags), serial_driver->refcount,info->count,tty->count,s)
+ tty->name, (info->tport.flags), serial_driver->refcount,info->count,tty->count,s)
 #else
 #define DBG_CNT(s)
 #endif
@@ -58,7 +58,6 @@
 #include <linux/types.h>
 #include <linux/serial.h>
-#include <linux/serialP.h>
 #include <linux/serial_reg.h>
 static char *serial_version = "4.30";
@@ -70,6 +69,7 @@ static char *serial_version = "4.30";
 #include <linux/interrupt.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
+#include <linux/circ_buf.h>
 #include <linux/console.h>
 #include <linux/major.h>
 #include <linux/string.h>
@@ -92,6 +92,24 @@ static char *serial_version = "4.30";
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
+struct serial_state {
+        struct tty_port         tport;
+        struct circ_buf         xmit;
+        struct async_icount     icount;
+        unsigned long           port;
+        int                     baud_base;
+        int                     xmit_fifo_size;
+        int                     custom_divisor;
+        int                     read_status_mask;
+        int                     ignore_status_mask;
+        int                     timeout;
+        int                     quot;
+        int                     IER;    /* Interrupt Enable Register */
+        int                     MCR;    /* Modem control register */
+        int                     x_char; /* xon/xoff character */
+};
 #define custom amiga_custom
 static char *serial_name = "Amiga-builtin serial driver";
@@ -100,11 +118,10 @@ static struct tty_driver *serial_driver;
 /* number of characters left in xmit buffer before we ask for more */
 #define WAKEUP_CHARS 256
-static struct async_struct *IRQ_ports;
 static unsigned char current_ctl_bits;
-static void change_speed(struct async_struct *info, struct ktermios *old);
+static void change_speed(struct tty_struct *tty, struct serial_state *info,
+                struct ktermios *old);
 static void rs_wait_until_sent(struct tty_struct *tty, int timeout);
@@ -117,7 +134,7 @@ static struct serial_state rs_table[1];
 #define serial_isroot() (capable(CAP_SYS_ADMIN))
-static inline int serial_paranoia_check(struct async_struct *info,
+static inline int serial_paranoia_check(struct serial_state *info,
                                        char *name, const char *routine)
 {
 #ifdef SERIAL_PARANOIA_CHECK
@@ -170,7 +187,7 @@ static __inline__ void rtsdtr_ctrl(int bits)
 */
 static void rs_stop(struct tty_struct *tty)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
        if (serial_paranoia_check(info, tty->name, "rs_stop"))
@@ -190,7 +207,7 @@ static void rs_stop(struct tty_struct *tty)
 static void rs_start(struct tty_struct *tty)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
        if (serial_paranoia_check(info, tty->name, "rs_start"))
@@ -231,27 +248,16 @@ static void rs_start(struct tty_struct *tty)
 * -----------------------------------------------------------------------
 */
-/*
+static void receive_chars(struct serial_state *info)
- * This routine is used by the interrupt handler to schedule
- * processing in the software interrupt portion of the driver.
- */
-static void rs_sched_event(struct async_struct *info,
-                           int event)
-{
-        info->event |= 1 << event;
-        tasklet_schedule(&info->tlet);
-}
-static void receive_chars(struct async_struct *info)
 {
        int status;
        int serdatr;
-        struct tty_struct *tty = info->tty;
+        struct tty_struct *tty = info->tport.tty;
        unsigned char ch, flag;
        struct  async_icount *icount;
        int oe = 0;
-        icount = &info->state->icount;
+        icount = &info->icount;
        status = UART_LSR_DR; /* We obviously have a character! */
        serdatr = custom.serdatr;
@@ -308,7 +314,7 @@ static void receive_chars(struct async_struct *info)
            printk("handling break....");
 #endif
            flag = TTY_BREAK;
-            if (info->flags & ASYNC_SAK)
+            if (info->tport.flags & ASYNC_SAK)
              do_SAK(tty);
          } else if (status & UART_LSR_PE)
            flag = TTY_PARITY;
@@ -331,20 +337,20 @@ out:
        return;
 }
-static void transmit_chars(struct async_struct *info)
+static void transmit_chars(struct serial_state *info)
 {
        custom.intreq = IF_TBE;
        mb();
        if (info->x_char) {
                custom.serdat = info->x_char | 0x100;
                mb();
-                info->state->icount.tx++;
+                info->icount.tx++;
                info->x_char = 0;
                return;
        }
        if (info->xmit.head == info->xmit.tail
-            || info->tty->stopped
+            || info->tport.tty->stopped
-            || info->tty->hw_stopped) {
+            || info->tport.tty->hw_stopped) {
                info->IER &= ~UART_IER_THRI;
                custom.intena = IF_TBE;
                mb();
@@ -354,12 +360,12 @@ static void transmit_chars(struct async_struct *info)
        custom.serdat = info->xmit.buf[info->xmit.tail++] | 0x100;
        mb();
        info->xmit.tail = info->xmit.tail & (SERIAL_XMIT_SIZE-1);
-        info->state->icount.tx++;
+        info->icount.tx++;
        if (CIRC_CNT(info->xmit.head,
                     info->xmit.tail,
                     SERIAL_XMIT_SIZE) < WAKEUP_CHARS)
-                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
+                tty_wakeup(info->tport.tty);
 #ifdef SERIAL_DEBUG_INTR
        printk("THRE...");
@@ -371,8 +377,9 @@ static void transmit_chars(struct async_struct *info)
        }
 }
-static void check_modem_status(struct async_struct *info)
+static void check_modem_status(struct serial_state *info)
 {
+        struct tty_port *port = &info->tport;
        unsigned char status = ciab.pra & (SER_DCD | SER_CTS | SER_DSR);
        unsigned char dstatus;
        struct  async_icount *icount;
@@ -382,52 +389,52 @@ static void check_modem_status(struct async_struct *info)
        current_ctl_bits = status;
        if (dstatus) {
-                icount = &info->state->icount;
+                icount = &info->icount;
                /* update input line counters */
                if (dstatus & SER_DSR)
                        icount->dsr++;
                if (dstatus & SER_DCD) {
                        icount->dcd++;
 #ifdef CONFIG_HARD_PPS
-                        if ((info->flags & ASYNC_HARDPPS_CD) &&
+                        if ((port->flags & ASYNC_HARDPPS_CD) &&
                            !(status & SER_DCD))
                                hardpps();
 #endif
                }
                if (dstatus & SER_CTS)
                        icount->cts++;
-                wake_up_interruptible(&info->delta_msr_wait);
+                wake_up_interruptible(&port->delta_msr_wait);
        }
-        if ((info->flags & ASYNC_CHECK_CD) && (dstatus & SER_DCD)) {
+        if ((port->flags & ASYNC_CHECK_CD) && (dstatus & SER_DCD)) {
 #if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR))
                printk("ttyS%d CD now %s...", info->line,
                       (!(status & SER_DCD)) ? "on" : "off");
 #endif
                if (!(status & SER_DCD))
-                        wake_up_interruptible(&info->open_wait);
+                        wake_up_interruptible(&port->open_wait);
                else {
 #ifdef SERIAL_DEBUG_OPEN
                        printk("doing serial hangup...");
 #endif
-                        if (info->tty)
+                        if (port->tty)
-                                tty_hangup(info->tty);
+                                tty_hangup(port->tty);
                }
        }
-        if (info->flags & ASYNC_CTS_FLOW) {
+        if (port->flags & ASYNC_CTS_FLOW) {
-                if (info->tty->hw_stopped) {
+                if (port->tty->hw_stopped) {
                        if (!(status & SER_CTS)) {
 #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
                                printk("CTS tx start...");
 #endif
-                                info->tty->hw_stopped = 0;
+                                port->tty->hw_stopped = 0;
                                info->IER |= UART_IER_THRI;
                                custom.intena = IF_SETCLR | IF_TBE;
                                mb();
                                /* set a pending Tx Interrupt, transmitter should restart now */
                                custom.intreq = IF_SETCLR | IF_TBE;
                                mb();
-                                rs_sched_event(info, RS_EVENT_WRITE_WAKEUP);
+                                tty_wakeup(port->tty);
                                return;
                        }
                } else {
@@ -435,7 +442,7 @@ static void check_modem_status(struct async_struct *info)
 #if (defined(SERIAL_DEBUG_INTR) || defined(SERIAL_DEBUG_FLOW))
                                printk("CTS tx stop...");
 #endif
-                                info->tty->hw_stopped = 1;
+                                port->tty->hw_stopped = 1;
                                info->IER &= ~UART_IER_THRI;
                                /* disable Tx interrupt and remove any pending interrupts */
                                custom.intena = IF_TBE;
@@ -450,7 +457,7 @@ static void check_modem_status(struct async_struct *info)
 static irqreturn_t ser_vbl_int( int irq, void *data)
 {
        /* vbl is just a periodic interrupt we tie into to update modem status */
-        struct async_struct * info = IRQ_ports;
+        struct serial_state *info = data;
        /*
         * TBD - is it better to unregister from this interrupt or to
         * ignore it if MSI is clear ?
@@ -462,18 +469,16 @@ static irqreturn_t ser_vbl_int( int irq, void *data)
 static irqreturn_t ser_rx_int(int irq, void *dev_id)
 {
-        struct async_struct * info;
+        struct serial_state *info = dev_id;
 #ifdef SERIAL_DEBUG_INTR
        printk("ser_rx_int...");
 #endif
-        info = IRQ_ports;
+        if (!info->tport.tty)
-        if (!info || !info->tty)
                return IRQ_NONE;
        receive_chars(info);
-        info->last_active = jiffies;
 #ifdef SERIAL_DEBUG_INTR
        printk("end.\n");
 #endif
@@ -482,19 +487,17 @@ static irqreturn_t ser_rx_int(int irq, void *dev_id)
 static irqreturn_t ser_tx_int(int irq, void *dev_id)
 {
-        struct async_struct * info;
+        struct serial_state *info = dev_id;
        if (custom.serdatr & SDR_TBE) {
 #ifdef SERIAL_DEBUG_INTR
          printk("ser_tx_int...");
 #endif
-          info = IRQ_ports;
+          if (!info->tport.tty)
-          if (!info || !info->tty)
                return IRQ_NONE;
          transmit_chars(info);
-          info->last_active = jiffies;
 #ifdef SERIAL_DEBUG_INTR
          printk("end.\n");
 #endif
@@ -509,29 +512,6 @@ static irqreturn_t ser_tx_int(int irq, void *dev_id)
 */
 /*
- * This routine is used to handle the "bottom half" processing for the
- * serial driver, known also the "software interrupt" processing.
- * This processing is done at the kernel interrupt level, after the
- * rs_interrupt() has returned, BUT WITH INTERRUPTS TURNED ON.  This
- * is where time-consuming activities which can not be done in the
- * interrupt driver proper are done; the interrupt driver schedules
- * them using rs_sched_event(), and they get done here.
- */
-static void do_softint(unsigned long private_)
-{
-        struct async_struct     *info = (struct async_struct *) private_;
-        struct tty_struct       *tty;
-        tty = info->tty;
-        if (!tty)
-                return;
-        if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event))
-                tty_wakeup(tty);
-}
-/*
 * ---------------------------------------------------------------
 * Low level utility subroutines for the serial driver:  routines to
 * figure out the appropriate timeout for an interrupt chain, routines
@@ -540,8 +520,9 @@ static void do_softint(unsigned long private_)
 * ---------------------------------------------------------------
 */
-static int startup(struct async_struct * info)
+static int startup(struct tty_struct *tty, struct serial_state *info)
 {
+        struct tty_port *port = &info->tport;
        unsigned long flags;
        int     retval=0;
        unsigned long page;
@@ -552,7 +533,7 @@ static int startup(struct async_struct * info)
        local_irq_save(flags);
-        if (info->flags & ASYNC_INITIALIZED) {
+        if (port->flags & ASYNC_INITIALIZED) {
                free_page(page);
                goto errout;
        }
@@ -574,9 +555,7 @@ static int startup(struct async_struct * info)
        retval = request_irq(IRQ_AMIGA_VERTB, ser_vbl_int, 0, "serial status", info);
        if (retval) {
          if (serial_isroot()) {
-            if (info->tty)
+              set_bit(TTY_IO_ERROR, &tty->flags);
-              set_bit(TTY_IO_ERROR,
-                      &info->tty->flags);
            retval = 0;
          }
          goto errout;
@@ -590,37 +569,32 @@ static int startup(struct async_struct * info)
        /* remember current state of the DCD and CTS bits */
        current_ctl_bits = ciab.pra & (SER_DCD | SER_CTS | SER_DSR);
-        IRQ_ports = info;
        info->MCR = 0;
-        if (info->tty->termios->c_cflag & CBAUD)
+        if (C_BAUD(tty))
          info->MCR = SER_DTR | SER_RTS;
        rtsdtr_ctrl(info->MCR);
-        if (info->tty)
+        clear_bit(TTY_IO_ERROR, &tty->flags);
-                clear_bit(TTY_IO_ERROR, &info->tty->flags);
        info->xmit.head = info->xmit.tail = 0;
        /*
         * Set up the tty->alt_speed kludge
         */
-        if (info->tty) {
+        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                tty->alt_speed = 57600;
-                        info->tty->alt_speed = 57600;
+        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                tty->alt_speed = 115200;
-                        info->tty->alt_speed = 115200;
+        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                tty->alt_speed = 230400;
-                        info->tty->alt_speed = 230400;
+        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                tty->alt_speed = 460800;
-                        info->tty->alt_speed = 460800;
-        }
        /*
         * and set the speed of the serial port
         */
-        change_speed(info, NULL);
+        change_speed(tty, info, NULL);
-        info->flags |= ASYNC_INITIALIZED;
+        port->flags |= ASYNC_INITIALIZED;
        local_irq_restore(flags);
        return 0;
@@ -633,15 +607,15 @@ errout:
 * This routine will shutdown a serial port; interrupts are disabled, and
 * DTR is dropped if the hangup on close termio flag is on.
 */
-static void shutdown(struct async_struct * info)
+static void shutdown(struct tty_struct *tty, struct serial_state *info)
 {
        unsigned long   flags;
        struct serial_state *state;
-        if (!(info->flags & ASYNC_INITIALIZED))
+        if (!(info->tport.flags & ASYNC_INITIALIZED))
                return;
-        state = info->state;
+        state = info;
 #ifdef SERIAL_DEBUG_OPEN
        printk("Shutting down serial port %d ....\n", info->line);
@@ -653,9 +627,7 @@ static void shutdown(struct async_struct * info)
         * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
         * here so the queue might never be waken up
         */
-        wake_up_interruptible(&info->delta_msr_wait);
+        wake_up_interruptible(&info->tport.delta_msr_wait);
-        IRQ_ports = NULL;
        /*
         * Free the IRQ, if necessary
@@ -675,14 +647,13 @@ static void shutdown(struct async_struct * info)
        custom.adkcon = AC_UARTBRK;
        mb();
-        if (!info->tty || (info->tty->termios->c_cflag & HUPCL))
+        if (tty->termios->c_cflag & HUPCL)
                info->MCR &= ~(SER_DTR|SER_RTS);
        rtsdtr_ctrl(info->MCR);
-        if (info->tty)
+        set_bit(TTY_IO_ERROR, &tty->flags);
-                set_bit(TTY_IO_ERROR, &info->tty->flags);
-        info->flags &= ~ASYNC_INITIALIZED;
+        info->tport.flags &= ~ASYNC_INITIALIZED;
        local_irq_restore(flags);
 }
@@ -691,17 +662,16 @@ static void shutdown(struct async_struct * info)
 * This routine is called to set the UART divisor registers to match
 * the specified baud rate for a serial port.
 */
-static void change_speed(struct async_struct *info,
+static void change_speed(struct tty_struct *tty, struct serial_state *info,
                         struct ktermios *old_termios)
 {
+        struct tty_port *port = &info->tport;
        int     quot = 0, baud_base, baud;
        unsigned cflag, cval = 0;
        int     bits;
        unsigned long   flags;
-        if (!info->tty || !info->tty->termios)
+        cflag = tty->termios->c_cflag;
-                return;
-        cflag = info->tty->termios->c_cflag;
        /* Byte size is always 8 bits plus parity bit if requested */
@@ -722,13 +692,12 @@ static void change_speed(struct async_struct *info,
 #endif
        /* Determine divisor based on baud rate */
-        baud = tty_get_baud_rate(info->tty);
+        baud = tty_get_baud_rate(tty);
        if (!baud)
                baud = 9600;    /* B0 transition handled in rs_set_termios */
-        baud_base = info->state->baud_base;
+        baud_base = info->baud_base;
-        if (baud == 38400 &&
+        if (baud == 38400 && (port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
-            ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
+                quot = info->custom_divisor;
-                quot = info->state->custom_divisor;
        else {
                if (baud == 134)
                        /* Special case since 134 is really 134.5 */
@@ -739,14 +708,14 @@ static void change_speed(struct async_struct *info,
        /* If the quotient is zero refuse the change */
        if (!quot && old_termios) {
                /* FIXME: Will need updating for new tty in the end */
-                info->tty->termios->c_cflag &= ~CBAUD;
+                tty->termios->c_cflag &= ~CBAUD;
-                info->tty->termios->c_cflag |= (old_termios->c_cflag & CBAUD);
+                tty->termios->c_cflag |= (old_termios->c_cflag & CBAUD);
-                baud = tty_get_baud_rate(info->tty);
+                baud = tty_get_baud_rate(tty);
                if (!baud)
                        baud = 9600;
                if (baud == 38400 &&
-                    ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
+                    (port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)
-                        quot = info->state->custom_divisor;
+                        quot = info->custom_divisor;
                else {
                        if (baud == 134)
                                /* Special case since 134 is really 134.5 */
@@ -764,17 +733,17 @@ static void change_speed(struct async_struct *info,
        /* CTS flow control flag and modem status interrupts */
        info->IER &= ~UART_IER_MSI;
-        if (info->flags & ASYNC_HARDPPS_CD)
+        if (port->flags & ASYNC_HARDPPS_CD)
                info->IER |= UART_IER_MSI;
        if (cflag & CRTSCTS) {
-                info->flags |= ASYNC_CTS_FLOW;
+                port->flags |= ASYNC_CTS_FLOW;
                info->IER |= UART_IER_MSI;
        } else
-                info->flags &= ~ASYNC_CTS_FLOW;
+                port->flags &= ~ASYNC_CTS_FLOW;
        if (cflag & CLOCAL)
-                info->flags &= ~ASYNC_CHECK_CD;
+                port->flags &= ~ASYNC_CHECK_CD;
        else {
-                info->flags |= ASYNC_CHECK_CD;
+                port->flags |= ASYNC_CHECK_CD;
                info->IER |= UART_IER_MSI;
        }
        /* TBD:
@@ -786,24 +755,24 @@ static void change_speed(struct async_struct *info,
         */
        info->read_status_mask = UART_LSR_OE | UART_LSR_DR;
-        if (I_INPCK(info->tty))
+        if (I_INPCK(tty))
                info->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
-        if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
+        if (I_BRKINT(tty) || I_PARMRK(tty))
                info->read_status_mask |= UART_LSR_BI;
        /*
         * Characters to ignore
         */
        info->ignore_status_mask = 0;
-        if (I_IGNPAR(info->tty))
+        if (I_IGNPAR(tty))
                info->ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
-        if (I_IGNBRK(info->tty)) {
+        if (I_IGNBRK(tty)) {
                info->ignore_status_mask |= UART_LSR_BI;
                /*
                 * If we're ignore parity and break indicators, ignore 
                 * overruns too.  (For real raw support).
                 */
-                if (I_IGNPAR(info->tty))
+                if (I_IGNPAR(tty))
                        info->ignore_status_mask |= UART_LSR_OE;
        }
        /*
@@ -828,13 +797,12 @@ static void change_speed(struct async_struct *info,
        mb();
        }
-        info->LCR = cval;                               /* Save LCR */
        local_irq_restore(flags);
 }
 static int rs_put_char(struct tty_struct *tty, unsigned char ch)
 {
-        struct async_struct *info;
+        struct serial_state *info;
        unsigned long flags;
        info = tty->driver_data;
@@ -861,7 +829,7 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch)
 static void rs_flush_chars(struct tty_struct *tty)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
        if (serial_paranoia_check(info, tty->name, "rs_flush_chars"))
@@ -886,11 +854,9 @@ static void rs_flush_chars(struct tty_struct *tty)
 static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count)
 {
        int     c, ret = 0;
-        struct async_struct *info;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
-        info = tty->driver_data;
        if (serial_paranoia_check(info, tty->name, "rs_write"))
                return 0;
@@ -934,7 +900,7 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count
 static int rs_write_room(struct tty_struct *tty)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        if (serial_paranoia_check(info, tty->name, "rs_write_room"))
                return 0;
@@ -943,7 +909,7 @@ static int rs_write_room(struct tty_struct *tty)
 static int rs_chars_in_buffer(struct tty_struct *tty)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))
                return 0;
@@ -952,7 +918,7 @@ static int rs_chars_in_buffer(struct tty_struct *tty)
 static void rs_flush_buffer(struct tty_struct *tty)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
        if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
@@ -969,7 +935,7 @@ static void rs_flush_buffer(struct tty_struct *tty)
 */
 static void rs_send_xchar(struct tty_struct *tty, char ch)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
        if (serial_paranoia_check(info, tty->name, "rs_send_char"))
@@ -1004,7 +970,7 @@ static void rs_send_xchar(struct tty_struct *tty, char ch)
 */
 static void rs_throttle(struct tty_struct * tty)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
 #ifdef SERIAL_DEBUG_THROTTLE
        char    buf[64];
@@ -1029,7 +995,7 @@ static void rs_throttle(struct tty_struct * tty)
 static void rs_unthrottle(struct tty_struct * tty)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
 #ifdef SERIAL_DEBUG_THROTTLE
        char    buf[64];
@@ -1060,25 +1026,22 @@ static void rs_unthrottle(struct tty_struct * tty)
 * ------------------------------------------------------------
 */
-static int get_serial_info(struct async_struct * info,
+static int get_serial_info(struct tty_struct *tty, struct serial_state *state,
                           struct serial_struct __user * retinfo)
 {
        struct serial_struct tmp;
-        struct serial_state *state = info->state;
   
        if (!retinfo)
                return -EFAULT;
        memset(&tmp, 0, sizeof(tmp));
        tty_lock();
-        tmp.type = state->type;
+        tmp.line = tty->index;
-        tmp.line = state->line;
        tmp.port = state->port;
-        tmp.irq = state->irq;
+        tmp.flags = state->tport.flags;
-        tmp.flags = state->flags;
        tmp.xmit_fifo_size = state->xmit_fifo_size;
        tmp.baud_base = state->baud_base;
-        tmp.close_delay = state->close_delay;
+        tmp.close_delay = state->tport.close_delay;
-        tmp.closing_wait = state->closing_wait;
+        tmp.closing_wait = state->tport.closing_wait;
        tmp.custom_divisor = state->custom_divisor;
        tty_unlock();
        if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))
@@ -1086,38 +1049,34 @@ static int get_serial_info(struct async_struct * info,
        return 0;
 }
-static int set_serial_info(struct async_struct * info,
+static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
                           struct serial_struct __user * new_info)
 {
+        struct tty_port *port = &state->tport;
        struct serial_struct new_serial;
-        struct serial_state old_state, *state;
+        bool change_spd;
-        unsigned int            change_irq,change_port;
        int                     retval = 0;
        if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
                return -EFAULT;
        tty_lock();
-        state = info->state;
+        change_spd = ((new_serial.flags ^ port->flags) & ASYNC_SPD_MASK) ||
-        old_state = *state;
+                new_serial.custom_divisor != state->custom_divisor;
-  
+        if (new_serial.irq || new_serial.port != state->port ||
-        change_irq = new_serial.irq != state->irq;
+                        new_serial.xmit_fifo_size != state->xmit_fifo_size) {
-        change_port = (new_serial.port != state->port);
+                tty_unlock();
-        if(change_irq || change_port || (new_serial.xmit_fifo_size != state->xmit_fifo_size)) {
+                return -EINVAL;
-          tty_unlock();
-          return -EINVAL;
        }
  
        if (!serial_isroot()) {
                if ((new_serial.baud_base != state->baud_base) ||
-                    (new_serial.close_delay != state->close_delay) ||
+                    (new_serial.close_delay != port->close_delay) ||
                    (new_serial.xmit_fifo_size != state->xmit_fifo_size) ||
                    ((new_serial.flags & ~ASYNC_USR_MASK) !=
-                     (state->flags & ~ASYNC_USR_MASK)))
+                     (port->flags & ~ASYNC_USR_MASK)))
                        return -EPERM;
-                state->flags = ((state->flags & ~ASYNC_USR_MASK) |
+                port->flags = ((port->flags & ~ASYNC_USR_MASK) |
-                               (new_serial.flags & ASYNC_USR_MASK));
-                info->flags = ((info->flags & ~ASYNC_USR_MASK) |
                               (new_serial.flags & ASYNC_USR_MASK));
                state->custom_divisor = new_serial.custom_divisor;
                goto check_and_exit;
@@ -1134,32 +1093,28 @@ static int set_serial_info(struct async_struct * info,
         */
        state->baud_base = new_serial.baud_base;
-        state->flags = ((state->flags & ~ASYNC_FLAGS) |
+        port->flags = ((port->flags & ~ASYNC_FLAGS) |
                        (new_serial.flags & ASYNC_FLAGS));
-        info->flags = ((state->flags & ~ASYNC_INTERNAL_FLAGS) |
-                       (info->flags & ASYNC_INTERNAL_FLAGS));
        state->custom_divisor = new_serial.custom_divisor;
-        state->close_delay = new_serial.close_delay * HZ/100;
+        port->close_delay = new_serial.close_delay * HZ/100;
-        state->closing_wait = new_serial.closing_wait * HZ/100;
+        port->closing_wait = new_serial.closing_wait * HZ/100;
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        tty->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 check_and_exit:
-        if (info->flags & ASYNC_INITIALIZED) {
+        if (port->flags & ASYNC_INITIALIZED) {
-                if (((old_state.flags & ASYNC_SPD_MASK) !=
+                if (change_spd) {
-                     (state->flags & ASYNC_SPD_MASK)) ||
+                        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                    (old_state.custom_divisor != state->custom_divisor)) {
+                                tty->alt_speed = 57600;
-                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+                        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                                info->tty->alt_speed = 57600;
+                                tty->alt_speed = 115200;
-                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+                        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                                info->tty->alt_speed = 115200;
+                                tty->alt_speed = 230400;
-                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+                        if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                                info->tty->alt_speed = 230400;
+                                tty->alt_speed = 460800;
-                        if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+                        change_speed(tty, state, NULL);
-                                info->tty->alt_speed = 460800;
-                        change_speed(info, NULL);
                }
        } else
-                retval = startup(info);
+                retval = startup(tty, state);
        tty_unlock();
        return retval;
 }
@@ -1175,7 +1130,7 @@ check_and_exit:
 *          transmit holding register is empty.  This functionality
 *          allows an RS485 driver to be written in user space. 
 */
-static int get_lsr_info(struct async_struct * info, unsigned int __user *value)
+static int get_lsr_info(struct serial_state *info, unsigned int __user *value)
 {
        unsigned char status;
        unsigned int result;
@@ -1194,7 +1149,7 @@ static int get_lsr_info(struct async_struct * info, unsigned int __user *value)
 static int rs_tiocmget(struct tty_struct *tty)
 {
-        struct async_struct * info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned char control, status;
        unsigned long flags;
@@ -1217,7 +1172,7 @@ static int rs_tiocmget(struct tty_struct *tty)
 static int rs_tiocmset(struct tty_struct *tty, unsigned int set,
                                                unsigned int clear)
 {
-        struct async_struct * info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
        if (serial_paranoia_check(info, tty->name, "rs_ioctl"))
@@ -1244,7 +1199,7 @@ static int rs_tiocmset(struct tty_struct *tty, unsigned int set,
 */
 static int rs_break(struct tty_struct *tty, int break_state)
 {
-        struct async_struct * info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
        if (serial_paranoia_check(info, tty->name, "rs_break"))
@@ -1269,12 +1224,12 @@ static int rs_break(struct tty_struct *tty, int break_state)
 static int rs_get_icount(struct tty_struct *tty,
                                struct serial_icounter_struct *icount)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        struct async_icount cnow;
        unsigned long flags;
        local_irq_save(flags);
-        cnow = info->state->icount;
+        cnow = info->icount;
        local_irq_restore(flags);
        icount->cts = cnow.cts;
        icount->dsr = cnow.dsr;
@@ -1294,7 +1249,7 @@ static int rs_get_icount(struct tty_struct *tty,
 static int rs_ioctl(struct tty_struct *tty,
                    unsigned int cmd, unsigned long arg)
 {
-        struct async_struct * info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        struct async_icount cprev, cnow;        /* kernel counter temps */
        void __user *argp = (void __user *)arg;
        unsigned long flags;
@@ -1311,9 +1266,9 @@ static int rs_ioctl(struct tty_struct *tty,
        switch (cmd) {
                case TIOCGSERIAL:
-                        return get_serial_info(info, argp);
+                        return get_serial_info(tty, info, argp);
                case TIOCSSERIAL:
-                        return set_serial_info(info, argp);
+                        return set_serial_info(tty, info, argp);
                case TIOCSERCONFIG:
                        return 0;
@@ -1322,7 +1277,7 @@ static int rs_ioctl(struct tty_struct *tty,
                case TIOCSERGSTRUCT:
                        if (copy_to_user(argp,
-                                         info, sizeof(struct async_struct)))
+                                         info, sizeof(struct serial_state)))
                                return -EFAULT;
                        return 0;
@@ -1335,15 +1290,15 @@ static int rs_ioctl(struct tty_struct *tty,
                case TIOCMIWAIT:
                        local_irq_save(flags);
                        /* note the counters on entry */
-                        cprev = info->state->icount;
+                        cprev = info->icount;
                        local_irq_restore(flags);
                        while (1) {
-                                interruptible_sleep_on(&info->delta_msr_wait);
+                                interruptible_sleep_on(&info->tport.delta_msr_wait);
                                /* see if a signal did it */
                                if (signal_pending(current))
                                        return -ERESTARTSYS;
                                local_irq_save(flags);
-                                cnow = info->state->icount; /* atomic copy */
+                                cnow = info->icount; /* atomic copy */
                                local_irq_restore(flags);
                                if (cnow.rng == cprev.rng && cnow.dsr == cprev.dsr && 
                                    cnow.dcd == cprev.dcd && cnow.cts == cprev.cts)
@@ -1372,11 +1327,11 @@ static int rs_ioctl(struct tty_struct *tty,
 static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
-        struct async_struct *info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long flags;
        unsigned int cflag = tty->termios->c_cflag;
-        change_speed(info, old_termios);
+        change_speed(tty, info, old_termios);
        /* Handle transition to B0 status */
        if ((old_termios->c_cflag & CBAUD) &&
@@ -1432,64 +1387,23 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 */
 static void rs_close(struct tty_struct *tty, struct file * filp)
 {
-        struct async_struct * info = tty->driver_data;
+        struct serial_state *state = tty->driver_data;
-        struct serial_state *state;
+        struct tty_port *port = &state->tport;
-        unsigned long flags;
-        if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
+        if (serial_paranoia_check(state, tty->name, "rs_close"))
                return;
-        state = info->state;
+        if (tty_port_close_start(port, tty, filp) == 0)
-        local_irq_save(flags);
-        if (tty_hung_up_p(filp)) {
-                DBG_CNT("before DEC-hung");
-                local_irq_restore(flags);
                return;
-        }
-#ifdef SERIAL_DEBUG_OPEN
-        printk("rs_close ttys%d, count = %d\n", info->line, state->count);
-#endif
-        if ((tty->count == 1) && (state->count != 1)) {
-                /*
-                 * Uh, oh.  tty->count is 1, which means that the tty
-                 * structure will be freed.  state->count should always
-                 * be one in these conditions.  If it's greater than
-                 * one, we've got real problems, since it means the
-                 * serial port won't be shutdown.
-                 */
-                printk("rs_close: bad serial port count; tty->count is 1, "
-                       "state->count is %d\n", state->count);
-                state->count = 1;
-        }
-        if (--state->count < 0) {
-                printk("rs_close: bad serial port count for ttys%d: %d\n",
-                       info->line, state->count);
-                state->count = 0;
-        }
-        if (state->count) {
-                DBG_CNT("before DEC-2");
-                local_irq_restore(flags);
-                return;
-        }
-        info->flags |= ASYNC_CLOSING;
-        /*
-         * Now we wait for the transmit buffer to clear; and we notify 
-         * the line discipline to only process XON/XOFF characters.
-         */
-        tty->closing = 1;
-        if (info->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, info->closing_wait);
        /*
         * At this point we stop accepting input.  To do this, we
         * disable the receive line status interrupts, and tell the
         * interrupt driver to stop checking the data ready bit in the
         * line status register.
         */
-        info->read_status_mask &= ~UART_LSR_DR;
+        state->read_status_mask &= ~UART_LSR_DR;
-        if (info->flags & ASYNC_INITIALIZED) {
+        if (port->flags & ASYNC_INITIALIZED) {
                /* disable receive interrupts */
                custom.intena = IF_RBF;
                mb();
@@ -1502,24 +1416,15 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
                 * has completely drained; this is especially
                 * important if there is a transmit FIFO!
                 */
-                rs_wait_until_sent(tty, info->timeout);
+                rs_wait_until_sent(tty, state->timeout);
        }
-        shutdown(info);
+        shutdown(tty, state);
        rs_flush_buffer(tty);
                
        tty_ldisc_flush(tty);
-        tty->closing = 0;
+        port->tty = NULL;
-        info->event = 0;
-        info->tty = NULL;
+        tty_port_close_end(port, tty);
-        if (info->blocked_open) {
-                if (info->close_delay) {
-                        msleep_interruptible(jiffies_to_msecs(info->close_delay));
-                }
-                wake_up_interruptible(&info->open_wait);
-        }
-        info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
-        wake_up_interruptible(&info->close_wait);
-        local_irq_restore(flags);
 }
 /*
@@ -1527,7 +1432,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
 */
 static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 {
-        struct async_struct * info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
        unsigned long orig_jiffies, char_time;
        int lsr;
@@ -1590,173 +1495,17 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 */
 static void rs_hangup(struct tty_struct *tty)
 {
-        struct async_struct * info = tty->driver_data;
+        struct serial_state *info = tty->driver_data;
-        struct serial_state *state = info->state;
        if (serial_paranoia_check(info, tty->name, "rs_hangup"))
                return;
-        state = info->state;
        rs_flush_buffer(tty);
-        shutdown(info);
+        shutdown(tty, info);
-        info->event = 0;
+        info->tport.count = 0;
-        state->count = 0;
+        info->tport.flags &= ~ASYNC_NORMAL_ACTIVE;
-        info->flags &= ~ASYNC_NORMAL_ACTIVE;
+        info->tport.tty = NULL;
-        info->tty = NULL;
+        wake_up_interruptible(&info->tport.open_wait);
-        wake_up_interruptible(&info->open_wait);
-}
-/*
- * ------------------------------------------------------------
- * rs_open() and friends
- * ------------------------------------------------------------
- */
-static int block_til_ready(struct tty_struct *tty, struct file * filp,
-                           struct async_struct *info)
-{
-#ifdef DECLARE_WAITQUEUE
-        DECLARE_WAITQUEUE(wait, current);
-#else
-        struct wait_queue wait = { current, NULL };
-#endif
-        struct serial_state *state = info->state;
-        int             retval;
-        int             do_clocal = 0, extra_count = 0;
-        unsigned long   flags;
-        /*
-         * If the device is in the middle of being closed, then block
-         * until it's done, and then try again.
-         */
-        if (tty_hung_up_p(filp) ||
-            (info->flags & ASYNC_CLOSING)) {
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
-#ifdef SERIAL_DO_RESTART
-                return ((info->flags & ASYNC_HUP_NOTIFY) ?
-                        -EAGAIN : -ERESTARTSYS);
-#else
-                return -EAGAIN;
-#endif
-        }
-        /*
-         * If non-blocking mode is set, or the port is not enabled,
-         * then make the check up front and then exit.
-         */
-        if ((filp->f_flags & O_NONBLOCK) ||
-            (tty->flags & (1 << TTY_IO_ERROR))) {
-                info->flags |= ASYNC_NORMAL_ACTIVE;
-                return 0;
-        }
-        if (tty->termios->c_cflag & CLOCAL)
-                do_clocal = 1;
-        /*
-         * Block waiting for the carrier detect and the line to become
-         * free (i.e., not in use by the callout).  While we are in
-         * this loop, state->count is dropped by one, so that
-         * rs_close() knows when to free things.  We restore it upon
-         * exit, either normal or abnormal.
-         */
-        retval = 0;
-        add_wait_queue(&info->open_wait, &wait);
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready before block: ttys%d, count = %d\n",
-               state->line, state->count);
-#endif
-        local_irq_save(flags);
-        if (!tty_hung_up_p(filp)) {
-                extra_count = 1;
-                state->count--;
-        }
-        local_irq_restore(flags);
-        info->blocked_open++;
-        while (1) {
-                local_irq_save(flags);
-                if (tty->termios->c_cflag & CBAUD)
-                        rtsdtr_ctrl(SER_DTR|SER_RTS);
-                local_irq_restore(flags);
-                set_current_state(TASK_INTERRUPTIBLE);
-                if (tty_hung_up_p(filp) ||
-                    !(info->flags & ASYNC_INITIALIZED)) {
-#ifdef SERIAL_DO_RESTART
-                        if (info->flags & ASYNC_HUP_NOTIFY)
-                                retval = -EAGAIN;
-                        else
-                                retval = -ERESTARTSYS;
-#else
-                        retval = -EAGAIN;
-#endif
-                        break;
-                }
-                if (!(info->flags & ASYNC_CLOSING) &&
-                    (do_clocal || (!(ciab.pra & SER_DCD)) ))
-                        break;
-                if (signal_pending(current)) {
-                        retval = -ERESTARTSYS;
-                        break;
-                }
-#ifdef SERIAL_DEBUG_OPEN
-                printk("block_til_ready blocking: ttys%d, count = %d\n",
-                       info->line, state->count);
-#endif
-                tty_unlock();
-                schedule();
-                tty_lock();
-        }
-        __set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->open_wait, &wait);
-        if (extra_count)
-                state->count++;
-        info->blocked_open--;
-#ifdef SERIAL_DEBUG_OPEN
-        printk("block_til_ready after blocking: ttys%d, count = %d\n",
-               info->line, state->count);
-#endif
-        if (retval)
-                return retval;
-        info->flags |= ASYNC_NORMAL_ACTIVE;
-        return 0;
-}
-static int get_async_struct(int line, struct async_struct **ret_info)
-{
-        struct async_struct *info;
-        struct serial_state *sstate;
-        sstate = rs_table + line;
-        sstate->count++;
-        if (sstate->info) {
-                *ret_info = sstate->info;
-                return 0;
-        }
-        info = kzalloc(sizeof(struct async_struct), GFP_KERNEL);
-        if (!info) {
-                sstate->count--;
-                return -ENOMEM;
-        }
-#ifdef DECLARE_WAITQUEUE
-        init_waitqueue_head(&info->open_wait);
-        init_waitqueue_head(&info->close_wait);
-        init_waitqueue_head(&info->delta_msr_wait);
-#endif
-        info->magic = SERIAL_MAGIC;
-        info->port = sstate->port;
-        info->flags = sstate->flags;
-        info->xmit_fifo_size = sstate->xmit_fifo_size;
-        info->line = line;
-        tasklet_init(&info->tlet, do_softint, (unsigned long)info);
-        info->state = sstate;
-        if (sstate->info) {
-                kfree(info);
-                *ret_info = sstate->info;
-                return 0;
-        }
-        *ret_info = sstate->info = info;
-        return 0;
 }
 /*
@@ -1767,91 +1516,42 @@ static int get_async_struct(int line, struct async_struct **ret_info)
 */
 static int rs_open(struct tty_struct *tty, struct file * filp)
 {
-        struct async_struct     *info;
+        struct serial_state *info = rs_table + tty->index;
-        int                     retval, line;
+        struct tty_port *port = &info->tport;
+        int retval;
-        line = tty->index;
+        port->count++;
-        if ((line < 0) || (line >= NR_PORTS)) {
+        port->tty = tty;
-                return -ENODEV;
-        }
-        retval = get_async_struct(line, &info);
-        if (retval) {
-                return retval;
-        }
        tty->driver_data = info;
-        info->tty = tty;
+        tty->port = port;
        if (serial_paranoia_check(info, tty->name, "rs_open"))
                return -ENODEV;
-#ifdef SERIAL_DEBUG_OPEN
+        tty->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-        printk("rs_open %s, count = %d\n", tty->name, info->state->count);
-#endif
-        info->tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-        /*
+        retval = startup(tty, info);
-         * If the port is the middle of closing, bail out now
-         */
-        if (tty_hung_up_p(filp) ||
-            (info->flags & ASYNC_CLOSING)) {
-                if (info->flags & ASYNC_CLOSING)
-                        interruptible_sleep_on(&info->close_wait);
-#ifdef SERIAL_DO_RESTART
-                return ((info->flags & ASYNC_HUP_NOTIFY) ?
-                        -EAGAIN : -ERESTARTSYS);
-#else
-                return -EAGAIN;
-#endif
-        }
-        /*
-         * Start up serial port
-         */
-        retval = startup(info);
-        if (retval) {
-                return retval;
-        }
-        retval = block_til_ready(tty, filp, info);
        if (retval) {
-#ifdef SERIAL_DEBUG_OPEN
-                printk("rs_open returning after block_til_ready with %d\n",
-                       retval);
-#endif
                return retval;
        }
-#ifdef SERIAL_DEBUG_OPEN
+        return tty_port_block_til_ready(port, tty, filp);
-        printk("rs_open %s successful...", tty->name);
-#endif
-        return 0;
 }
 /*
 * /proc fs routines....
 */
-static inline void line_info(struct seq_file *m, struct serial_state *state)
+static inline void line_info(struct seq_file *m, int line,
+                struct serial_state *state)
 {
-        struct async_struct *info = state->info, scr_info;
        char    stat_buf[30], control, status;
        unsigned long flags;
-        seq_printf(m, "%d: uart:amiga_builtin",state->line);
+        seq_printf(m, "%d: uart:amiga_builtin", line);
-        /*
-         * Figure out the current RS-232 lines
-         */
-        if (!info) {
-                info = &scr_info;       /* This is just for serial_{in,out} */
-                info->magic = SERIAL_MAGIC;
-                info->flags = state->flags;
-                info->quot = 0;
-                info->tty = NULL;
-        }
        local_irq_save(flags);
        status = ciab.pra;
-        control = info ? info->MCR : status;
+        control = (state->tport.flags & ASYNC_INITIALIZED) ? state->MCR : status;
        local_irq_restore(flags);
        stat_buf[0] = 0;
@@ -1867,9 +1567,8 @@ static inline void line_info(struct seq_file *m, struct serial_state *state)
        if(!(status & SER_DCD))
                strcat(stat_buf, "|CD");
-        if (info->quot) {
+        if (state->quot)
-                seq_printf(m, " baud:%d", state->baud_base / info->quot);
+                seq_printf(m, " baud:%d", state->baud_base / state->quot);
-        }
        seq_printf(m, " tx:%d rx:%d", state->icount.tx, state->icount.rx);
@@ -1894,7 +1593,7 @@ static inline void line_info(struct seq_file *m, struct serial_state *state)
 static int rs_proc_show(struct seq_file *m, void *v)
 {
        seq_printf(m, "serinfo:1.0 driver:%s\n", serial_version);
-        line_info(m, &rs_table[0]);
+        line_info(m, 0, &rs_table[0]);
        return 0;
 }
@@ -1955,6 +1654,32 @@ static const struct tty_operations serial_ops = {
        .proc_fops = &rs_proc_fops,
 };
+static int amiga_carrier_raised(struct tty_port *port)
+{
+        return !(ciab.pra & SER_DCD);
+}
+static void amiga_dtr_rts(struct tty_port *port, int raise)
+{
+        struct serial_state *info = container_of(port, struct serial_state,
+                        tport);
+        unsigned long flags;
+        if (raise)
+                info->MCR |= SER_DTR|SER_RTS;
+        else
+                info->MCR &= ~(SER_DTR|SER_RTS);
+        local_irq_save(flags);
+        rtsdtr_ctrl(info->MCR);
+        local_irq_restore(flags);
+}
+static const struct tty_port_operations amiga_port_ops = {
+        .carrier_raised = amiga_carrier_raised,
+        .dtr_rts = amiga_dtr_rts,
+};
 /*
 * The serial driver boot-time initialization code!
 */
@@ -1964,17 +1689,14 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
        struct serial_state * state;
        int error;
-        serial_driver = alloc_tty_driver(1);
+        serial_driver = alloc_tty_driver(NR_PORTS);
        if (!serial_driver)
                return -ENOMEM;
-        IRQ_ports = NULL;
        show_serial_version();
        /* Initialize the tty_driver structure */
-        serial_driver->owner = THIS_MODULE;
        serial_driver->driver_name = "amiserial";
        serial_driver->name = "ttyS";
        serial_driver->major = TTY_MAJOR;
@@ -1992,20 +1714,17 @@ static int __init amiga_serial_probe(struct platform_device *pdev)
                goto fail_put_tty_driver;
        state = rs_table;
-        state->magic = SSTATE_MAGIC;
        state->port = (int)&custom.serdatr; /* Just to give it a value */
-        state->line = 0;
        state->custom_divisor = 0;
-        state->close_delay = 5*HZ/10;
-        state->closing_wait = 30*HZ;
        state->icount.cts = state->icount.dsr = 
          state->icount.rng = state->icount.dcd = 0;
        state->icount.rx = state->icount.tx = 0;
        state->icount.frame = state->icount.parity = 0;
        state->icount.overrun = state->icount.brk = 0;
+        tty_port_init(&state->tport);
+        state->tport.ops = &amiga_port_ops;
-        printk(KERN_INFO "ttyS%d is the amiga builtin serial port\n",
+        printk(KERN_INFO "ttyS0 is the amiga builtin serial port\n");
-                       state->line);
        /* Hardware set up */
@@ -2058,20 +1777,15 @@ static int __exit amiga_serial_remove(struct platform_device *pdev)
 {
        int error;
        struct serial_state *state = platform_get_drvdata(pdev);
-        struct async_struct *info = state->info;
        /* printk("Unloading %s: version %s\n", serial_name, serial_version); */
-        tasklet_kill(&info->tlet);
        if ((error = tty_unregister_driver(serial_driver)))
                printk("SERIAL: failed to unregister serial driver (%d)\n",
                       error);
        put_tty_driver(serial_driver);
-        rs_table[0].info = NULL;
+        free_irq(IRQ_AMIGA_TBE, state);
-        kfree(info);
+        free_irq(IRQ_AMIGA_RBF, state);
-        free_irq(IRQ_AMIGA_TBE, rs_table);
-        free_irq(IRQ_AMIGA_RBF, rs_table);
        platform_set_drvdata(pdev, NULL);
diff --git a/drivers/tty/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c
index 3a997760ec32..946f799861f5 100644
--- a/drivers/tty/bfin_jtag_comm.c
+++ b/drivers/tty/bfin_jtag_comm.c
@@ -257,7 +257,6 @@ static int __init bfin_jc_init(void)
        if (!bfin_jc_driver)
                goto err_driver;
-        bfin_jc_driver->owner        = THIS_MODULE;
        bfin_jc_driver->driver_name  = DRV_NAME;
        bfin_jc_driver->name         = DEV_NAME;
        bfin_jc_driver->type         = TTY_DRIVER_TYPE_SERIAL;
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index c9bf779481d8..e61cabdd69df 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -1515,13 +1515,9 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
 static int cy_open(struct tty_struct *tty, struct file *filp)
 {
        struct cyclades_port *info;
-        unsigned int i, line;
+        unsigned int i, line = tty->index;
        int retval;
-        line = tty->index;
-        if (tty->index < 0 || NR_PORTS <= line)
-                return -ENODEV;
        for (i = 0; i < NR_CARDS; i++)
                if (line < cy_card[i].first_line + cy_card[i].nports &&
                                line >= cy_card[i].first_line)
@@ -2413,7 +2409,7 @@ static int get_lsr_info(struct cyclades_port *info, unsigned int __user *value)
                /* Not supported yet */
                return -EINVAL;
        }
-        return put_user(result, (unsigned long __user *)value);
+        return put_user(result, value);
 }
 static int cy_tiocmget(struct tty_struct *tty)
@@ -4090,7 +4086,6 @@ static int __init cy_init(void)
        /* Initialize the tty_driver structure */
-        cy_serial_driver->owner = THIS_MODULE;
        cy_serial_driver->driver_name = "cyclades";
        cy_serial_driver->name = "ttyC";
        cy_serial_driver->major = CYCLADES_MAJOR;
diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c
index 1595dba0072c..4813684cb634 100644
--- a/drivers/tty/ehv_bytechan.c
+++ b/drivers/tty/ehv_bytechan.c
@@ -825,7 +825,6 @@ static int __init ehv_bc_init(void)
                goto error;
        }
-        ehv_bc_driver->owner = THIS_MODULE;
        ehv_bc_driver->driver_name = "ehv-bc";
        ehv_bc_driver->name = ehv_bc_console.name;
        ehv_bc_driver->type = TTY_DRIVER_TYPE_CONSOLE;
diff --git a/drivers/tty/hvc/hvc_beat.c b/drivers/tty/hvc/hvc_beat.c
index 5fe4631e2a61..1560d235449e 100644
--- a/drivers/tty/hvc/hvc_beat.c
+++ b/drivers/tty/hvc/hvc_beat.c
@@ -113,7 +113,7 @@ static int __init hvc_beat_init(void)
        if (!firmware_has_feature(FW_FEATURE_BEAT))
                return -ENODEV;
-        hp = hvc_alloc(0, NO_IRQ, &hvc_beat_get_put_ops, 16);
+        hp = hvc_alloc(0, 0, &hvc_beat_get_put_ops, 16);
        if (IS_ERR(hp))
                return PTR_ERR(hp);
        hvc_beat_dev = hp;
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index b6b2d18fa38d..8880adf5fc6f 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -917,7 +917,6 @@ static int hvc_init(void)
                goto out;
        }
-        drv->owner = THIS_MODULE;
        drv->driver_name = "hvc";
        drv->name = "hvc";
        drv->major = HVC_MAJOR;
diff --git a/drivers/tty/hvc/hvc_rtas.c b/drivers/tty/hvc/hvc_rtas.c
index 61c4a61558d9..0069bb86ba49 100644
--- a/drivers/tty/hvc/hvc_rtas.c
+++ b/drivers/tty/hvc/hvc_rtas.c
@@ -94,7 +94,7 @@ static int __init hvc_rtas_init(void)
        /* Allocate an hvc_struct for the console device we instantiated
         * earlier.  Save off hp so that we can return it on exit */
-        hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops, 16);
+        hp = hvc_alloc(hvc_rtas_cookie, 0, &hvc_rtas_get_put_ops, 16);
        if (IS_ERR(hp))
                return PTR_ERR(hp);
diff --git a/drivers/tty/hvc/hvc_udbg.c b/drivers/tty/hvc/hvc_udbg.c
index b0957e61a7be..4c9b13e7748c 100644
--- a/drivers/tty/hvc/hvc_udbg.c
+++ b/drivers/tty/hvc/hvc_udbg.c
@@ -69,7 +69,7 @@ static int __init hvc_udbg_init(void)
        BUG_ON(hvc_udbg_dev);
-        hp = hvc_alloc(0, NO_IRQ, &hvc_udbg_ops, 16);
+        hp = hvc_alloc(0, 0, &hvc_udbg_ops, 16);
        if (IS_ERR(hp))
                return PTR_ERR(hp);
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 52fdf60bdbe2..a1b0a75c3eae 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -176,7 +176,7 @@ static int __init xen_hvc_init(void)
                xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn);
        }
        if (xencons_irq < 0)
-                xencons_irq = 0; /* NO_IRQ */
+                xencons_irq = 0;
        else
                irq_set_noprobe(xencons_irq);
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index b9040bec36bd..d23759183b47 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -1090,27 +1090,23 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
 */
 static struct hvcs_struct *hvcs_get_by_index(int index)
 {
-        struct hvcs_struct *hvcsd = NULL;
+        struct hvcs_struct *hvcsd;
        unsigned long flags;
        spin_lock(&hvcs_structs_lock);
-        /* We can immediately discard OOB requests */
+        list_for_each_entry(hvcsd, &hvcs_structs, next) {
-        if (index >= 0 && index < HVCS_MAX_SERVER_ADAPTERS) {
+                spin_lock_irqsave(&hvcsd->lock, flags);
-                list_for_each_entry(hvcsd, &hvcs_structs, next) {
+                if (hvcsd->index == index) {
-                        spin_lock_irqsave(&hvcsd->lock, flags);
+                        kref_get(&hvcsd->kref);
-                        if (hvcsd->index == index) {
-                                kref_get(&hvcsd->kref);
-                                spin_unlock_irqrestore(&hvcsd->lock, flags);
-                                spin_unlock(&hvcs_structs_lock);
-                                return hvcsd;
-                        }
                        spin_unlock_irqrestore(&hvcsd->lock, flags);
+                        spin_unlock(&hvcs_structs_lock);
+                        return hvcsd;
                }
-                hvcsd = NULL;
+                spin_unlock_irqrestore(&hvcsd->lock, flags);
        }
        spin_unlock(&hvcs_structs_lock);
-        return hvcsd;
+        return NULL;
 }
 /*
@@ -1203,7 +1199,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
 {
        struct hvcs_struct *hvcsd;
        unsigned long flags;
-        int irq = NO_IRQ;
+        int irq;
        /*
         * Is someone trying to close the file associated with this device after
@@ -1264,7 +1260,7 @@ static void hvcs_hangup(struct tty_struct * tty)
        struct hvcs_struct *hvcsd = tty->driver_data;
        unsigned long flags;
        int temp_open_count;
-        int irq = NO_IRQ;
+        int irq;
        spin_lock_irqsave(&hvcsd->lock, flags);
        /* Preserve this so that we know how many kref refs to put */
@@ -1499,8 +1495,6 @@ static int __devinit hvcs_initialize(void)
                goto index_fail;
        }
-        hvcs_tty_driver->owner = THIS_MODULE;
        hvcs_tty_driver->driver_name = hvcs_driver_name;
        hvcs_tty_driver->name = hvcs_device_node;
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
index cdfa3e02d627..a7488b748647 100644
--- a/drivers/tty/hvc/hvsi.c
+++ b/drivers/tty/hvc/hvsi.c
@@ -737,14 +737,11 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
 {
        struct hvsi_struct *hp;
        unsigned long flags;
-        int line = tty->index;
        int ret;
        pr_debug("%s\n", __func__);
-        if (line < 0 || line >= hvsi_count)
+        hp = &hvsi_ports[tty->index];
-                return -ENODEV;
-        hp = &hvsi_ports[line];
        tty->driver_data = hp;
@@ -1088,7 +1085,6 @@ static int __init hvsi_init(void)
        if (!hvsi_driver)
                return -ENOMEM;
-        hvsi_driver->owner = THIS_MODULE;
        hvsi_driver->driver_name = "hvsi";
        hvsi_driver->name = "hvsi";
        hvsi_driver->major = HVSI_MAJOR;
@@ -1237,7 +1233,7 @@ static int __init hvsi_console_init(void)
                hp->state = HVSI_CLOSED;
                hp->vtermno = *vtermno;
                hp->virq = irq_create_mapping(NULL, irq[0]);
-                if (hp->virq == NO_IRQ) {
+                if (hp->virq == 0) {
                        printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",
                                __func__, irq[0]);
                        continue;
diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
index ef92869502a7..77ceaa9c9e3f 100644
--- a/drivers/tty/ipwireless/tty.c
+++ b/drivers/tty/ipwireless/tty.c
@@ -90,33 +90,23 @@ static void report_deregistering(struct ipw_tty *tty)
               tty->index);
 }
-static struct ipw_tty *get_tty(int minor)
+static struct ipw_tty *get_tty(int index)
 {
-        if (minor < ipw_tty_driver->minor_start
+        /*
-                        || minor >= ipw_tty_driver->minor_start +
+         * The 'ras_raw' channel is only available when 'loopback' mode
-                        IPWIRELESS_PCMCIA_MINORS)
+         * is enabled.
+         * Number of minor starts with 16 (_RANGE * _RAS_RAW).
+         */
+        if (!ipwireless_loopback && index >=
+                         IPWIRELESS_PCMCIA_MINOR_RANGE * TTYTYPE_RAS_RAW)
                return NULL;
-        else {
-                int minor_offset = minor - ipw_tty_driver->minor_start;
+        return ttys[index];
-                /*
-                 * The 'ras_raw' channel is only available when 'loopback' mode
-                 * is enabled.
-                 * Number of minor starts with 16 (_RANGE * _RAS_RAW).
-                 */
-                if (!ipwireless_loopback &&
-                                minor_offset >=
-                                 IPWIRELESS_PCMCIA_MINOR_RANGE * TTYTYPE_RAS_RAW)
-                        return NULL;
-                return ttys[minor_offset];
-        }
 }
 static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
 {
-        int minor = linux_tty->index;
+        struct ipw_tty *tty = get_tty(linux_tty->index);
-        struct ipw_tty *tty = get_tty(minor);
        if (!tty)
                return -ENODEV;
@@ -510,7 +500,7 @@ static int add_tty(int j,
                ipwireless_associate_network_tty(network,
                                                 secondary_channel_idx,
                                                 ttys[j]);
-        if (get_tty(j + ipw_tty_driver->minor_start) == ttys[j])
+        if (get_tty(j) == ttys[j])
                report_registering(ttys[j]);
        return 0;
 }
@@ -570,7 +560,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
                if (ttyj) {
                        mutex_lock(&ttyj->ipw_tty_mutex);
-                        if (get_tty(j + ipw_tty_driver->minor_start) == ttyj)
+                        if (get_tty(j) == ttyj)
                                report_deregistering(ttyj);
                        ttyj->closing = 1;
                        if (ttyj->linux_tty != NULL) {
@@ -614,7 +604,6 @@ int ipwireless_tty_init(void)
        if (!ipw_tty_driver)
                return -ENOMEM;
-        ipw_tty_driver->owner = THIS_MODULE;
        ipw_tty_driver->driver_name = IPWIRELESS_PCCARD_NAME;
        ipw_tty_driver->name = "ttyIPWp";
        ipw_tty_driver->major = 0;
diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index e5c295ab5dec..03c14979accf 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -849,8 +849,6 @@ static struct tty_port *isicom_find_port(struct tty_struct *tty)
        unsigned int board;
        int line = tty->index;
-        if (line < 0 || line > PORT_COUNT-1)
-                return NULL;
        board = BOARD(line);
        card = &isi_card[board];
@@ -1678,7 +1676,6 @@ static int __init isicom_init(void)
                goto error;
        }
-        isicom_normal->owner                    = THIS_MODULE;
        isicom_normal->name                     = "ttyM";
        isicom_normal->major                    = ISICOM_NMAJOR;
        isicom_normal->minor_start              = 0;
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index d15a071b1a54..8a8d0440bab0 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -1036,7 +1036,6 @@ static int __init moxa_init(void)
        if (!moxaDriver)
                return -ENOMEM;
-        moxaDriver->owner = THIS_MODULE;
        moxaDriver->name = "ttyMX";
        moxaDriver->major = ttymajor;
        moxaDriver->minor_start = 0;
@@ -1331,7 +1330,7 @@ static void moxa_start(struct tty_struct *tty)
        if (ch == NULL)
                return;
-        if (!(ch->statusflags & TXSTOPPED))
+        if (!test_bit(TXSTOPPED, &ch->statusflags))
                return;
        MoxaPortTxEnable(ch);
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 8998d527232a..17ff377e4129 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1010,8 +1010,6 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
        line = tty->index;
        if (line == MXSER_PORTS)
                return 0;
-        if (line < 0 || line > MXSER_PORTS)
-                return -ENODEV;
        info = &mxser_boards[line / MXSER_PORTS_PER_BOARD].ports[line % MXSER_PORTS_PER_BOARD];
        if (!info->ioaddr)
                return -ENODEV;
@@ -2658,12 +2656,9 @@ static int __init mxser_module_init(void)
                MXSER_VERSION);
        /* Initialize the tty_driver structure */
-        mxvar_sdriver->owner = THIS_MODULE;
-        mxvar_sdriver->magic = TTY_DRIVER_MAGIC;
        mxvar_sdriver->name = "ttyMI";
        mxvar_sdriver->major = ttymajor;
        mxvar_sdriver->minor_start = 0;
-        mxvar_sdriver->num = MXSER_PORTS + 1;
        mxvar_sdriver->type = TTY_DRIVER_TYPE_SERIAL;
        mxvar_sdriver->subtype = SERIAL_TYPE_NORMAL;
        mxvar_sdriver->init_termios = tty_std_termios;
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index fc7bbba585ce..c43b683b6eb8 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -3120,7 +3120,6 @@ static int __init gsm_init(void)
                pr_err("gsm_init: tty allocation failed.\n");
                return -EINVAL;
        }
-        gsm_tty_driver->owner   = THIS_MODULE;
        gsm_tty_driver->driver_name     = "gsmtty";
        gsm_tty_driver->name            = "gsmtty";
        gsm_tty_driver->major           = 0;    /* Dynamic */
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index fd347ff34d07..e7592f9037da 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -1602,13 +1602,9 @@ static int ntty_install(struct tty_driver *driver, struct tty_struct *tty)
        int ret;
        if (!port || !dc || dc->state != NOZOMI_STATE_READY)
                return -ENODEV;
-        ret = tty_init_termios(tty);
+        ret = tty_standard_install(driver, tty);
-        if (ret == 0) {
+        if (ret == 0)
-                tty_driver_kref_get(driver);
-                tty->count++;
                tty->driver_data = port;
-                driver->ttys[tty->index] = tty;
-        }
        return ret;
 }
@@ -1920,7 +1916,6 @@ static __init int nozomi_init(void)
        if (!ntty_driver)
                return -ENOMEM;
-        ntty_driver->owner = THIS_MODULE;
        ntty_driver->driver_name = NOZOMI_NAME_TTY;
        ntty_driver->name = "noz";
        ntty_driver->major = 0;
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index d8653ab6f498..f96ecaec24f8 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -21,7 +21,6 @@
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <linux/sysctl.h>
 #include <linux/device.h>
 #include <linux/uaccess.h>
 #include <linux/bitops.h>
@@ -394,7 +393,6 @@ static void __init legacy_pty_init(void)
        if (!pty_slave_driver)
                panic("Couldn't allocate pty slave driver");
-        pty_driver->owner = THIS_MODULE;
        pty_driver->driver_name = "pty_master";
        pty_driver->name = "pty";
        pty_driver->major = PTY_MASTER_MAJOR;
@@ -412,7 +410,6 @@ static void __init legacy_pty_init(void)
        pty_driver->other = pty_slave_driver;
        tty_set_operations(pty_driver, &master_pty_ops_bsd);
-        pty_slave_driver->owner = THIS_MODULE;
        pty_slave_driver->driver_name = "pty_slave";
        pty_slave_driver->name = "ttyp";
        pty_slave_driver->major = PTY_SLAVE_MAJOR;
@@ -439,55 +436,9 @@ static inline void legacy_pty_init(void) { }
 /* Unix98 devices */
 #ifdef CONFIG_UNIX98_PTYS
-/*
- * sysctl support for setting limits on the number of Unix98 ptys allocated.
- * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly.
- */
-int pty_limit = NR_UNIX98_PTY_DEFAULT;
-static int pty_limit_min;
-static int pty_limit_max = NR_UNIX98_PTY_MAX;
-static int pty_count;
 static struct cdev ptmx_cdev;
-static struct ctl_table pty_table[] = {
-        {
-                .procname       = "max",
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .data           = &pty_limit,
-                .proc_handler   = proc_dointvec_minmax,
-                .extra1         = &pty_limit_min,
-                .extra2         = &pty_limit_max,
-        }, {
-                .procname       = "nr",
-                .maxlen         = sizeof(int),
-                .mode           = 0444,
-                .data           = &pty_count,
-                .proc_handler   = proc_dointvec,
-        }, 
-        {}
-};
-static struct ctl_table pty_kern_table[] = {
-        {
-                .procname       = "pty",
-                .mode           = 0555,
-                .child          = pty_table,
-        },
-        {}
-};
-static struct ctl_table pty_root_table[] = {
-        {
-                .procname       = "kernel",
-                .mode           = 0555,
-                .child          = pty_kern_table,
-        },
-        {}
-};
 static int pty_unix98_ioctl(struct tty_struct *tty,
                            unsigned int cmd, unsigned long arg)
 {
@@ -515,10 +466,8 @@ static int pty_unix98_ioctl(struct tty_struct *tty,
 static struct tty_struct *ptm_unix98_lookup(struct tty_driver *driver,
                struct inode *ptm_inode, int idx)
 {
-        struct tty_struct *tty = devpts_get_tty(ptm_inode, idx);
+        /* Master must be open via /dev/ptmx */
-        if (tty)
+        return ERR_PTR(-EIO);
-                tty = tty->link;
-        return tty;
 }
 /**
@@ -589,7 +538,6 @@ static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty)
         */
        tty_driver_kref_get(driver);
        tty->count++;
-        pty_count++;
        return 0;
 err_free_mem:
        deinitialize_tty_struct(o_tty);
@@ -603,7 +551,6 @@ err_free_tty:
 static void ptm_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
 {
-        pty_count--;
 }
 static void pts_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
@@ -677,7 +624,7 @@ static int ptmx_open(struct inode *inode, struct file *filp)
        mutex_lock(&tty_mutex);
        tty_lock();
-        tty = tty_init_dev(ptm_driver, index, 1);
+        tty = tty_init_dev(ptm_driver, index);
        mutex_unlock(&tty_mutex);
        if (IS_ERR(tty)) {
@@ -722,7 +669,6 @@ static void __init unix98_pty_init(void)
        if (!pts_driver)
                panic("Couldn't allocate Unix98 pts driver");
-        ptm_driver->owner = THIS_MODULE;
        ptm_driver->driver_name = "pty_master";
        ptm_driver->name = "ptm";
        ptm_driver->major = UNIX98_PTY_MASTER_MAJOR;
@@ -741,7 +687,6 @@ static void __init unix98_pty_init(void)
        ptm_driver->other = pts_driver;
        tty_set_operations(ptm_driver, &ptm_unix98_ops);
-        pts_driver->owner = THIS_MODULE;
        pts_driver->driver_name = "pty_slave";
        pts_driver->name = "pts";
        pts_driver->major = UNIX98_PTY_SLAVE_MAJOR;
@@ -762,8 +707,6 @@ static void __init unix98_pty_init(void)
        if (tty_register_driver(pts_driver))
                panic("Couldn't register Unix98 pts driver");
-        register_sysctl_table(pty_root_table);
        /* Now create the /dev/ptmx special device */
        tty_default_fops(&ptmx_fops);
        ptmx_fops.open = ptmx_open;
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index de88aa5566e5..777d5f9cf6cc 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -892,12 +892,12 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
 {
        struct r_port *info;
        struct tty_port *port;
-        int line = 0, retval;
+        int retval;
        CHANNEL_t *cp;
        unsigned long page;
-        line = tty->index;
+        info = rp_table[tty->index];
-        if (line < 0 || line >= MAX_RP_PORTS || ((info = rp_table[line]) == NULL))
+        if (info == NULL)
                return -ENXIO;
        port = &info->port;
        
@@ -2277,7 +2277,6 @@ static int __init rp_init(void)
         * driver with the tty layer.
         */
-        rocket_driver->owner = THIS_MODULE;
        rocket_driver->flags = TTY_DRIVER_DYNAMIC_DEV;
        rocket_driver->name = "ttyR";
        rocket_driver->driver_name = "Comtrol RocketPort";
diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c
index 1b37626e8f13..f899996b4363 100644
--- a/drivers/tty/serial/21285.c
+++ b/drivers/tty/serial/21285.c
@@ -331,7 +331,7 @@ static int serial21285_verify_port(struct uart_port *port, struct serial_struct
        int ret = 0;
        if (ser->type != PORT_UNKNOWN && ser->type != PORT_21285)
                ret = -EINVAL;
-        if (ser->irq != NO_IRQ)
+        if (ser->irq <= 0)
                ret = -EINVAL;
        if (ser->baud_base != port->uartclk / 16)
                ret = -EINVAL;
@@ -360,7 +360,7 @@ static struct uart_ops serial21285_ops = {
 static struct uart_port serial21285_port = {
        .mapbase        = 0x42000160,
        .iotype         = UPIO_MEM,
-        .irq            = NO_IRQ,
+        .irq            = 0,
        .fifosize       = 16,
        .ops            = &serial21285_ops,
        .flags          = UPF_BOOT_AUTOCONF,
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index a88ef9782a4f..7398390e7e65 100644
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@ -1190,14 +1190,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
 int rs_open(struct tty_struct *tty, struct file * filp)
 {
        struct m68k_serial      *info;
-        int                     retval, line;
+        int retval;
-        line = tty->index;
-        
-        if (line >= NR_PORTS || line < 0) /* we have exactly one */
-                return -ENODEV;
-        info = &m68k_soft[line];
+        info = &m68k_soft[tty->index];
        if (serial_paranoia_check(info, tty->name, "rs_open"))
                return -ENODEV;
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c
index 9b7336fcfbb3..5b149b466ec8 100644
--- a/drivers/tty/serial/8250/8250.c
+++ b/drivers/tty/serial/8250/8250.c
@@ -38,16 +38,15 @@
 #include <linux/nmi.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
+#ifdef CONFIG_SPARC
+#include <linux/sunserialcore.h>
+#endif
 #include <asm/io.h>
 #include <asm/irq.h>
 #include "8250.h"
-#ifdef CONFIG_SPARC
-#include "../suncore.h"
-#endif
 /*
 * Configuration:
 *   share_irqs - whether we pass IRQF_SHARED to request_irq().  This option
@@ -86,13 +85,6 @@ static unsigned int skip_txen_test; /* force skip of txen test at init time */
 #define BOTH_EMPTY      (UART_LSR_TEMT | UART_LSR_THRE)
-/*
- * We default to IRQ0 for the "no irq" hack.   Some
- * machine types want others as well - they're free
- * to redefine this in their header file.
- */
-#define is_real_interrupt(irq)  ((irq) != 0)
 #ifdef CONFIG_SERIAL_8250_DETECT_IRQ
 #define CONFIG_SERIAL_DETECT_IRQ 1
 #endif
@@ -475,9 +467,8 @@ static void set_io_from_upio(struct uart_port *p)
 }
 static void
-serial_out_sync(struct uart_8250_port *up, int offset, int value)
+serial_port_out_sync(struct uart_port *p, int offset, int value)
 {
-        struct uart_port *p = &up->port;
        switch (p->iotype) {
        case UPIO_MEM:
        case UPIO_MEM32:
@@ -490,30 +481,17 @@ serial_out_sync(struct uart_8250_port *up, int offset, int value)
        }
 }
-#define serial_in(up, offset)           \
-        (up->port.serial_in(&(up)->port, (offset)))
-#define serial_out(up, offset, value)   \
-        (up->port.serial_out(&(up)->port, (offset), (value)))
-/*
- * We used to support using pause I/O for certain machines.  We
- * haven't supported this for a while, but just in case it's badly
- * needed for certain old 386 machines, I've left these #define's
- * in....
- */
-#define serial_inp(up, offset)          serial_in(up, offset)
-#define serial_outp(up, offset, value)  serial_out(up, offset, value)
 /* Uart divisor latch read */
 static inline int _serial_dl_read(struct uart_8250_port *up)
 {
-        return serial_inp(up, UART_DLL) | serial_inp(up, UART_DLM) << 8;
+        return serial_in(up, UART_DLL) | serial_in(up, UART_DLM) << 8;
 }
 /* Uart divisor latch write */
 static inline void _serial_dl_write(struct uart_8250_port *up, int value)
 {
-        serial_outp(up, UART_DLL, value & 0xff);
+        serial_out(up, UART_DLL, value & 0xff);
-        serial_outp(up, UART_DLM, value >> 8 & 0xff);
+        serial_out(up, UART_DLM, value >> 8 & 0xff);
 }
 #if defined(CONFIG_MIPS_ALCHEMY)
@@ -583,10 +561,10 @@ static unsigned int serial_icr_read(struct uart_8250_port *up, int offset)
 static void serial8250_clear_fifos(struct uart_8250_port *p)
 {
        if (p->capabilities & UART_CAP_FIFO) {
-                serial_outp(p, UART_FCR, UART_FCR_ENABLE_FIFO);
+                serial_out(p, UART_FCR, UART_FCR_ENABLE_FIFO);
-                serial_outp(p, UART_FCR, UART_FCR_ENABLE_FIFO |
+                serial_out(p, UART_FCR, UART_FCR_ENABLE_FIFO |
                               UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
-                serial_outp(p, UART_FCR, 0);
+                serial_out(p, UART_FCR, 0);
        }
 }
@@ -599,15 +577,15 @@ static void serial8250_set_sleep(struct uart_8250_port *p, int sleep)
 {
        if (p->capabilities & UART_CAP_SLEEP) {
                if (p->capabilities & UART_CAP_EFR) {
-                        serial_outp(p, UART_LCR, UART_LCR_CONF_MODE_B);
+                        serial_out(p, UART_LCR, UART_LCR_CONF_MODE_B);
-                        serial_outp(p, UART_EFR, UART_EFR_ECB);
+                        serial_out(p, UART_EFR, UART_EFR_ECB);
-                        serial_outp(p, UART_LCR, 0);
+                        serial_out(p, UART_LCR, 0);
                }
-                serial_outp(p, UART_IER, sleep ? UART_IERX_SLEEP : 0);
+                serial_out(p, UART_IER, sleep ? UART_IERX_SLEEP : 0);
                if (p->capabilities & UART_CAP_EFR) {
-                        serial_outp(p, UART_LCR, UART_LCR_CONF_MODE_B);
+                        serial_out(p, UART_LCR, UART_LCR_CONF_MODE_B);
-                        serial_outp(p, UART_EFR, 0);
+                        serial_out(p, UART_EFR, 0);
-                        serial_outp(p, UART_LCR, 0);
+                        serial_out(p, UART_LCR, 0);
                }
        }
 }
@@ -622,12 +600,12 @@ static int __enable_rsa(struct uart_8250_port *up)
        unsigned char mode;
        int result;
-        mode = serial_inp(up, UART_RSA_MSR);
+        mode = serial_in(up, UART_RSA_MSR);
        result = mode & UART_RSA_MSR_FIFO;
        if (!result) {
-                serial_outp(up, UART_RSA_MSR, mode | UART_RSA_MSR_FIFO);
+                serial_out(up, UART_RSA_MSR, mode | UART_RSA_MSR_FIFO);
-                mode = serial_inp(up, UART_RSA_MSR);
+                mode = serial_in(up, UART_RSA_MSR);
                result = mode & UART_RSA_MSR_FIFO;
        }
@@ -646,7 +624,7 @@ static void enable_rsa(struct uart_8250_port *up)
                        spin_unlock_irq(&up->port.lock);
                }
                if (up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16)
-                        serial_outp(up, UART_RSA_FRR, 0);
+                        serial_out(up, UART_RSA_FRR, 0);
        }
 }
@@ -665,12 +643,12 @@ static void disable_rsa(struct uart_8250_port *up)
            up->port.uartclk == SERIAL_RSA_BAUD_BASE * 16) {
                spin_lock_irq(&up->port.lock);
-                mode = serial_inp(up, UART_RSA_MSR);
+                mode = serial_in(up, UART_RSA_MSR);
                result = !(mode & UART_RSA_MSR_FIFO);
                if (!result) {
-                        serial_outp(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
+                        serial_out(up, UART_RSA_MSR, mode & ~UART_RSA_MSR_FIFO);
-                        mode = serial_inp(up, UART_RSA_MSR);
+                        mode = serial_in(up, UART_RSA_MSR);
                        result = !(mode & UART_RSA_MSR_FIFO);
                }
@@ -691,28 +669,28 @@ static int size_fifo(struct uart_8250_port *up)
        unsigned short old_dl;
        int count;
-        old_lcr = serial_inp(up, UART_LCR);
+        old_lcr = serial_in(up, UART_LCR);
-        serial_outp(up, UART_LCR, 0);
+        serial_out(up, UART_LCR, 0);
-        old_fcr = serial_inp(up, UART_FCR);
+        old_fcr = serial_in(up, UART_FCR);
-        old_mcr = serial_inp(up, UART_MCR);
+        old_mcr = serial_in(up, UART_MCR);
-        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO |
                    UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
-        serial_outp(up, UART_MCR, UART_MCR_LOOP);
+        serial_out(up, UART_MCR, UART_MCR_LOOP);
-        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_A);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
        old_dl = serial_dl_read(up);
        serial_dl_write(up, 0x0001);
-        serial_outp(up, UART_LCR, 0x03);
+        serial_out(up, UART_LCR, 0x03);
        for (count = 0; count < 256; count++)
-                serial_outp(up, UART_TX, count);
+                serial_out(up, UART_TX, count);
        mdelay(20);/* FIXME - schedule_timeout */
-        for (count = 0; (serial_inp(up, UART_LSR) & UART_LSR_DR) &&
+        for (count = 0; (serial_in(up, UART_LSR) & UART_LSR_DR) &&
             (count < 256); count++)
-                serial_inp(up, UART_RX);
+                serial_in(up, UART_RX);
-        serial_outp(up, UART_FCR, old_fcr);
+        serial_out(up, UART_FCR, old_fcr);
-        serial_outp(up, UART_MCR, old_mcr);
+        serial_out(up, UART_MCR, old_mcr);
-        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_A);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
        serial_dl_write(up, old_dl);
-        serial_outp(up, UART_LCR, old_lcr);
+        serial_out(up, UART_LCR, old_lcr);
        return count;
 }
@@ -727,20 +705,20 @@ static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)
        unsigned char old_dll, old_dlm, old_lcr;
        unsigned int id;
-        old_lcr = serial_inp(p, UART_LCR);
+        old_lcr = serial_in(p, UART_LCR);
-        serial_outp(p, UART_LCR, UART_LCR_CONF_MODE_A);
+        serial_out(p, UART_LCR, UART_LCR_CONF_MODE_A);
-        old_dll = serial_inp(p, UART_DLL);
+        old_dll = serial_in(p, UART_DLL);
-        old_dlm = serial_inp(p, UART_DLM);
+        old_dlm = serial_in(p, UART_DLM);
-        serial_outp(p, UART_DLL, 0);
+        serial_out(p, UART_DLL, 0);
-        serial_outp(p, UART_DLM, 0);
+        serial_out(p, UART_DLM, 0);
-        id = serial_inp(p, UART_DLL) | serial_inp(p, UART_DLM) << 8;
+        id = serial_in(p, UART_DLL) | serial_in(p, UART_DLM) << 8;
-        serial_outp(p, UART_DLL, old_dll);
+        serial_out(p, UART_DLL, old_dll);
-        serial_outp(p, UART_DLM, old_dlm);
+        serial_out(p, UART_DLM, old_dlm);
-        serial_outp(p, UART_LCR, old_lcr);
+        serial_out(p, UART_LCR, old_lcr);
        return id;
 }
@@ -850,11 +828,11 @@ static void autoconfig_8250(struct uart_8250_port *up)
        up->port.type = PORT_8250;
        scratch = serial_in(up, UART_SCR);
-        serial_outp(up, UART_SCR, 0xa5);
+        serial_out(up, UART_SCR, 0xa5);
        status1 = serial_in(up, UART_SCR);
-        serial_outp(up, UART_SCR, 0x5a);
+        serial_out(up, UART_SCR, 0x5a);
        status2 = serial_in(up, UART_SCR);
-        serial_outp(up, UART_SCR, scratch);
+        serial_out(up, UART_SCR, scratch);
        if (status1 == 0xa5 && status2 == 0x5a)
                up->port.type = PORT_16450;
@@ -885,7 +863,7 @@ static inline int ns16550a_goto_highspeed(struct uart_8250_port *up)
        } else {
                status &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
                status |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
-                serial_outp(up, 0x04, status);
+                serial_out(up, 0x04, status);
        }
        return 1;
 }
@@ -908,9 +886,9 @@ static void autoconfig_16550a(struct uart_8250_port *up)
         * Check for presence of the EFR when DLAB is set.
         * Only ST16C650V1 UARTs pass this test.
         */
-        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_A);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
        if (serial_in(up, UART_EFR) == 0) {
-                serial_outp(up, UART_EFR, 0xA8);
+                serial_out(up, UART_EFR, 0xA8);
                if (serial_in(up, UART_EFR) != 0) {
                        DEBUG_AUTOCONF("EFRv1 ");
                        up->port.type = PORT_16650;
@@ -918,7 +896,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
                } else {
                        DEBUG_AUTOCONF("Motorola 8xxx DUART ");
                }
-                serial_outp(up, UART_EFR, 0);
+                serial_out(up, UART_EFR, 0);
                return;
        }
@@ -926,7 +904,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
         * Maybe it requires 0xbf to be written to the LCR.
         * (other ST16C650V2 UARTs, TI16C752A, etc)
         */
-        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
        if (serial_in(up, UART_EFR) == 0 && !broken_efr(up)) {
                DEBUG_AUTOCONF("EFRv2 ");
                autoconfig_has_efr(up);
@@ -940,23 +918,23 @@ static void autoconfig_16550a(struct uart_8250_port *up)
         * switch back to bank 2, read it from EXCR1 again and check
         * it's changed. If so, set baud_base in EXCR2 to 921600. -- dwmw2
         */
-        serial_outp(up, UART_LCR, 0);
+        serial_out(up, UART_LCR, 0);
        status1 = serial_in(up, UART_MCR);
-        serial_outp(up, UART_LCR, 0xE0);
+        serial_out(up, UART_LCR, 0xE0);
        status2 = serial_in(up, 0x02); /* EXCR1 */
        if (!((status2 ^ status1) & UART_MCR_LOOP)) {
-                serial_outp(up, UART_LCR, 0);
+                serial_out(up, UART_LCR, 0);
-                serial_outp(up, UART_MCR, status1 ^ UART_MCR_LOOP);
+                serial_out(up, UART_MCR, status1 ^ UART_MCR_LOOP);
-                serial_outp(up, UART_LCR, 0xE0);
+                serial_out(up, UART_LCR, 0xE0);
                status2 = serial_in(up, 0x02); /* EXCR1 */
-                serial_outp(up, UART_LCR, 0);
+                serial_out(up, UART_LCR, 0);
-                serial_outp(up, UART_MCR, status1);
+                serial_out(up, UART_MCR, status1);
                if ((status2 ^ status1) & UART_MCR_LOOP) {
                        unsigned short quot;
-                        serial_outp(up, UART_LCR, 0xE0);
+                        serial_out(up, UART_LCR, 0xE0);
                        quot = serial_dl_read(up);
                        quot <<= 3;
@@ -964,7 +942,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
                        if (ns16550a_goto_highspeed(up))
                                serial_dl_write(up, quot);
-                        serial_outp(up, UART_LCR, 0);
+                        serial_out(up, UART_LCR, 0);
                        up->port.uartclk = 921600*16;
                        up->port.type = PORT_NS16550A;
@@ -979,15 +957,15 @@ static void autoconfig_16550a(struct uart_8250_port *up)
         * Try setting it with and without DLAB set.  Cheap clones
         * set bit 5 without DLAB set.
         */
-        serial_outp(up, UART_LCR, 0);
+        serial_out(up, UART_LCR, 0);
-        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
        status1 = serial_in(up, UART_IIR) >> 5;
-        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
-        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_A);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
        status2 = serial_in(up, UART_IIR) >> 5;
-        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
-        serial_outp(up, UART_LCR, 0);
+        serial_out(up, UART_LCR, 0);
        DEBUG_AUTOCONF("iir1=%d iir2=%d ", status1, status2);
@@ -1006,13 +984,13 @@ static void autoconfig_16550a(struct uart_8250_port *up)
         * already a 1 and maybe locked there before we even start start.
         */
        iersave = serial_in(up, UART_IER);
-        serial_outp(up, UART_IER, iersave & ~UART_IER_UUE);
+        serial_out(up, UART_IER, iersave & ~UART_IER_UUE);
        if (!(serial_in(up, UART_IER) & UART_IER_UUE)) {
                /*
                 * OK it's in a known zero state, try writing and reading
                 * without disturbing the current state of the other bits.
                 */
-                serial_outp(up, UART_IER, iersave | UART_IER_UUE);
+                serial_out(up, UART_IER, iersave | UART_IER_UUE);
                if (serial_in(up, UART_IER) & UART_IER_UUE) {
                        /*
                         * It's an Xscale.
@@ -1030,7 +1008,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
                 */
                DEBUG_AUTOCONF("Couldn't force IER_UUE to 0 ");
        }
-        serial_outp(up, UART_IER, iersave);
+        serial_out(up, UART_IER, iersave);
        /*
         * Exar uarts have EFR in a weird location
@@ -1061,24 +1039,25 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
 {
        unsigned char status1, scratch, scratch2, scratch3;
        unsigned char save_lcr, save_mcr;
+        struct uart_port *port = &up->port;
        unsigned long flags;
-        if (!up->port.iobase && !up->port.mapbase && !up->port.membase)
+        if (!port->iobase && !port->mapbase && !port->membase)
                return;
        DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04lx, 0x%p): ",
-                       serial_index(&up->port), up->port.iobase, up->port.membase);
+                       serial_index(port), port->iobase, port->membase);
        /*
         * We really do need global IRQs disabled here - we're going to
         * be frobbing the chips IRQ enable register to see if it exists.
         */
-        spin_lock_irqsave(&up->port.lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
        up->capabilities = 0;
        up->bugs = 0;
-        if (!(up->port.flags & UPF_BUGGY_UART)) {
+        if (!(port->flags & UPF_BUGGY_UART)) {
                /*
                 * Do a simple existence test first; if we fail this,
                 * there's no point trying anything else.
@@ -1092,8 +1071,8 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
                 * Note: this is safe as long as MCR bit 4 is clear
                 * and the device is in "PC" mode.
                 */
-                scratch = serial_inp(up, UART_IER);
+                scratch = serial_in(up, UART_IER);
-                serial_outp(up, UART_IER, 0);
+                serial_out(up, UART_IER, 0);
 #ifdef __i386__
                outb(0xff, 0x080);
 #endif
@@ -1101,13 +1080,13 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
                 * Mask out IER[7:4] bits for test as some UARTs (e.g. TL
                 * 16C754B) allow only to modify them if an EFR bit is set.
                 */
-                scratch2 = serial_inp(up, UART_IER) & 0x0f;
+                scratch2 = serial_in(up, UART_IER) & 0x0f;
-                serial_outp(up, UART_IER, 0x0F);
+                serial_out(up, UART_IER, 0x0F);
 #ifdef __i386__
                outb(0, 0x080);
 #endif
-                scratch3 = serial_inp(up, UART_IER) & 0x0f;
+                scratch3 = serial_in(up, UART_IER) & 0x0f;
-                serial_outp(up, UART_IER, scratch);
+                serial_out(up, UART_IER, scratch);
                if (scratch2 != 0 || scratch3 != 0x0F) {
                        /*
                         * We failed; there's nothing here
@@ -1130,10 +1109,10 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
         * manufacturer would be stupid enough to design a board
         * that conflicts with COM 1-4 --- we hope!
         */
-        if (!(up->port.flags & UPF_SKIP_TEST)) {
+        if (!(port->flags & UPF_SKIP_TEST)) {
-                serial_outp(up, UART_MCR, UART_MCR_LOOP | 0x0A);
+                serial_out(up, UART_MCR, UART_MCR_LOOP | 0x0A);
-                status1 = serial_inp(up, UART_MSR) & 0xF0;
+                status1 = serial_in(up, UART_MSR) & 0xF0;
-                serial_outp(up, UART_MCR, save_mcr);
+                serial_out(up, UART_MCR, save_mcr);
                if (status1 != 0x90) {
                        DEBUG_AUTOCONF("LOOP test failed (%02x) ",
                                       status1);
@@ -1150,11 +1129,11 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
         * We also initialise the EFR (if any) to zero for later.  The
         * EFR occupies the same register location as the FCR and IIR.
         */
-        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
-        serial_outp(up, UART_EFR, 0);
+        serial_out(up, UART_EFR, 0);
-        serial_outp(up, UART_LCR, 0);
+        serial_out(up, UART_LCR, 0);
-        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+        serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO);
        scratch = serial_in(up, UART_IIR) >> 6;
        DEBUG_AUTOCONF("iir=%d ", scratch);
@@ -1164,10 +1143,10 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
                autoconfig_8250(up);
                break;
        case 1:
-                up->port.type = PORT_UNKNOWN;
+                port->type = PORT_UNKNOWN;
                break;
        case 2:
-                up->port.type = PORT_16550;
+                port->type = PORT_16550;
                break;
        case 3:
                autoconfig_16550a(up);
@@ -1178,102 +1157,102 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
        /*
         * Only probe for RSA ports if we got the region.
         */
-        if (up->port.type == PORT_16550A && probeflags & PROBE_RSA) {
+        if (port->type == PORT_16550A && probeflags & PROBE_RSA) {
                int i;
                for (i = 0 ; i < probe_rsa_count; ++i) {
-                        if (probe_rsa[i] == up->port.iobase &&
+                        if (probe_rsa[i] == port->iobase && __enable_rsa(up)) {
-                            __enable_rsa(up)) {
+                                port->type = PORT_RSA;
-                                up->port.type = PORT_RSA;
                                break;
                        }
                }
        }
 #endif
-        serial_outp(up, UART_LCR, save_lcr);
+        serial_out(up, UART_LCR, save_lcr);
-        if (up->capabilities != uart_config[up->port.type].flags) {
+        if (up->capabilities != uart_config[port->type].flags) {
                printk(KERN_WARNING
                       "ttyS%d: detected caps %08x should be %08x\n",
-                       serial_index(&up->port), up->capabilities,
+                       serial_index(port), up->capabilities,
-                       uart_config[up->port.type].flags);
+                       uart_config[port->type].flags);
        }
-        up->port.fifosize = uart_config[up->port.type].fifo_size;
+        port->fifosize = uart_config[up->port.type].fifo_size;
-        up->capabilities = uart_config[up->port.type].flags;
+        up->capabilities = uart_config[port->type].flags;
-        up->tx_loadsz = uart_config[up->port.type].tx_loadsz;
+        up->tx_loadsz = uart_config[port->type].tx_loadsz;
-        if (up->port.type == PORT_UNKNOWN)
+        if (port->type == PORT_UNKNOWN)
                goto out;
        /*
         * Reset the UART.
         */
 #ifdef CONFIG_SERIAL_8250_RSA
-        if (up->port.type == PORT_RSA)
+        if (port->type == PORT_RSA)
-                serial_outp(up, UART_RSA_FRR, 0);
+                serial_out(up, UART_RSA_FRR, 0);
 #endif
-        serial_outp(up, UART_MCR, save_mcr);
+        serial_out(up, UART_MCR, save_mcr);
        serial8250_clear_fifos(up);
        serial_in(up, UART_RX);
        if (up->capabilities & UART_CAP_UUE)
-                serial_outp(up, UART_IER, UART_IER_UUE);
+                serial_out(up, UART_IER, UART_IER_UUE);
        else
-                serial_outp(up, UART_IER, 0);
+                serial_out(up, UART_IER, 0);
 out:
-        spin_unlock_irqrestore(&up->port.lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
-        DEBUG_AUTOCONF("type=%s\n", uart_config[up->port.type].name);
+        DEBUG_AUTOCONF("type=%s\n", uart_config[port->type].name);
 }
 static void autoconfig_irq(struct uart_8250_port *up)
 {
+        struct uart_port *port = &up->port;
        unsigned char save_mcr, save_ier;
        unsigned char save_ICP = 0;
        unsigned int ICP = 0;
        unsigned long irqs;
        int irq;
-        if (up->port.flags & UPF_FOURPORT) {
+        if (port->flags & UPF_FOURPORT) {
-                ICP = (up->port.iobase & 0xfe0) | 0x1f;
+                ICP = (port->iobase & 0xfe0) | 0x1f;
                save_ICP = inb_p(ICP);
                outb_p(0x80, ICP);
-                (void) inb_p(ICP);
+                inb_p(ICP);
        }
        /* forget possible initially masked and pending IRQ */
        probe_irq_off(probe_irq_on());
-        save_mcr = serial_inp(up, UART_MCR);
+        save_mcr = serial_in(up, UART_MCR);
-        save_ier = serial_inp(up, UART_IER);
+        save_ier = serial_in(up, UART_IER);
-        serial_outp(up, UART_MCR, UART_MCR_OUT1 | UART_MCR_OUT2);
+        serial_out(up, UART_MCR, UART_MCR_OUT1 | UART_MCR_OUT2);
        irqs = probe_irq_on();
-        serial_outp(up, UART_MCR, 0);
+        serial_out(up, UART_MCR, 0);
        udelay(10);
-        if (up->port.flags & UPF_FOURPORT) {
+        if (port->flags & UPF_FOURPORT) {
-                serial_outp(up, UART_MCR,
+                serial_out(up, UART_MCR,
                            UART_MCR_DTR | UART_MCR_RTS);
        } else {
-                serial_outp(up, UART_MCR,
+                serial_out(up, UART_MCR,
                            UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2);
        }
-        serial_outp(up, UART_IER, 0x0f);        /* enable all intrs */
+        serial_out(up, UART_IER, 0x0f); /* enable all intrs */
-        (void)serial_inp(up, UART_LSR);
+        serial_in(up, UART_LSR);
-        (void)serial_inp(up, UART_RX);
+        serial_in(up, UART_RX);
-        (void)serial_inp(up, UART_IIR);
+        serial_in(up, UART_IIR);
-        (void)serial_inp(up, UART_MSR);
+        serial_in(up, UART_MSR);
-        serial_outp(up, UART_TX, 0xFF);
+        serial_out(up, UART_TX, 0xFF);
        udelay(20);
        irq = probe_irq_off(irqs);
-        serial_outp(up, UART_MCR, save_mcr);
+        serial_out(up, UART_MCR, save_mcr);
-        serial_outp(up, UART_IER, save_ier);
+        serial_out(up, UART_IER, save_ier);
-        if (up->port.flags & UPF_FOURPORT)
+        if (port->flags & UPF_FOURPORT)
                outb_p(save_ICP, ICP);
-        up->port.irq = (irq > 0) ? irq : 0;
+        port->irq = (irq > 0) ? irq : 0;
 }
 static inline void __stop_tx(struct uart_8250_port *p)
@@ -1294,7 +1273,7 @@ static void serial8250_stop_tx(struct uart_port *port)
        /*
         * We really want to stop the transmitter from sending.
         */
-        if (up->port.type == PORT_16C950) {
+        if (port->type == PORT_16C950) {
                up->acr |= UART_ACR_TXDIS;
                serial_icr_write(up, UART_ACR, up->acr);
        }
@@ -1307,13 +1286,13 @@ static void serial8250_start_tx(struct uart_port *port)
        if (!(up->ier & UART_IER_THRI)) {
                up->ier |= UART_IER_THRI;
-                serial_out(up, UART_IER, up->ier);
+                serial_port_out(port, UART_IER, up->ier);
                if (up->bugs & UART_BUG_TXEN) {
                        unsigned char lsr;
                        lsr = serial_in(up, UART_LSR);
                        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
-                        if ((up->port.type == PORT_RM9000) ?
+                        if ((port->type == PORT_RM9000) ?
                                (lsr & UART_LSR_THRE) :
                                (lsr & UART_LSR_TEMT))
                                serial8250_tx_chars(up);
@@ -1323,7 +1302,7 @@ static void serial8250_start_tx(struct uart_port *port)
        /*
         * Re-enable the transmitter if we disabled it.
         */
-        if (up->port.type == PORT_16C950 && up->acr & UART_ACR_TXDIS) {
+        if (port->type == PORT_16C950 && up->acr & UART_ACR_TXDIS) {
                up->acr &= ~UART_ACR_TXDIS;
                serial_icr_write(up, UART_ACR, up->acr);
        }
@@ -1336,7 +1315,7 @@ static void serial8250_stop_rx(struct uart_port *port)
        up->ier &= ~UART_IER_RLSI;
        up->port.read_status_mask &= ~UART_LSR_DR;
-        serial_out(up, UART_IER, up->ier);
+        serial_port_out(port, UART_IER, up->ier);
 }
 static void serial8250_enable_ms(struct uart_port *port)
@@ -1349,7 +1328,7 @@ static void serial8250_enable_ms(struct uart_port *port)
                return;
        up->ier |= UART_IER_MSI;
-        serial_out(up, UART_IER, up->ier);
+        serial_port_out(port, UART_IER, up->ier);
 }
 /*
@@ -1381,14 +1360,15 @@ static void clear_rx_fifo(struct uart_8250_port *up)
 unsigned char
 serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
 {
-        struct tty_struct *tty = up->port.state->port.tty;
+        struct uart_port *port = &up->port;
+        struct tty_struct *tty = port->state->port.tty;
        unsigned char ch;
        int max_count = 256;
        char flag;
        do {
                if (likely(lsr & UART_LSR_DR))
-                        ch = serial_inp(up, UART_RX);
+                        ch = serial_in(up, UART_RX);
                else
                        /*
                         * Intel 82571 has a Serial Over Lan device that will
@@ -1400,7 +1380,7 @@ serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
                        ch = 0;
                flag = TTY_NORMAL;
-                up->port.icount.rx++;
+                port->icount.rx++;
                lsr |= up->lsr_saved_flags;
                up->lsr_saved_flags = 0;
@@ -1411,12 +1391,12 @@ serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
                         */
                        if (lsr & UART_LSR_BI) {
                                lsr &= ~(UART_LSR_FE | UART_LSR_PE);
-                                up->port.icount.brk++;
+                                port->icount.brk++;
                                /*
                                 * If tegra port then clear the rx fifo to
                                 * accept another break/character.
                                 */
-                                if (up->port.type == PORT_TEGRA)
+                                if (port->type == PORT_TEGRA)
                                        clear_rx_fifo(up);
                                /*
@@ -1425,19 +1405,19 @@ serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
                                 * may get masked by ignore_status_mask
                                 * or read_status_mask.
                                 */
-                                if (uart_handle_break(&up->port))
+                                if (uart_handle_break(port))
                                        goto ignore_char;
                        } else if (lsr & UART_LSR_PE)
-                                up->port.icount.parity++;
+                                port->icount.parity++;
                        else if (lsr & UART_LSR_FE)
-                                up->port.icount.frame++;
+                                port->icount.frame++;
                        if (lsr & UART_LSR_OE)
-                                up->port.icount.overrun++;
+                                port->icount.overrun++;
                        /*
                         * Mask off conditions which should be ignored.
                         */
-                        lsr &= up->port.read_status_mask;
+                        lsr &= port->read_status_mask;
                        if (lsr & UART_LSR_BI) {
                                DEBUG_INTR("handling break....");
@@ -1447,34 +1427,35 @@ serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
                        else if (lsr & UART_LSR_FE)
                                flag = TTY_FRAME;
                }
-                if (uart_handle_sysrq_char(&up->port, ch))
+                if (uart_handle_sysrq_char(port, ch))
                        goto ignore_char;
-                uart_insert_char(&up->port, lsr, UART_LSR_OE, ch, flag);
+                uart_insert_char(port, lsr, UART_LSR_OE, ch, flag);
 ignore_char:
-                lsr = serial_inp(up, UART_LSR);
+                lsr = serial_in(up, UART_LSR);
        } while ((lsr & (UART_LSR_DR | UART_LSR_BI)) && (max_count-- > 0));
-        spin_unlock(&up->port.lock);
+        spin_unlock(&port->lock);
        tty_flip_buffer_push(tty);
-        spin_lock(&up->port.lock);
+        spin_lock(&port->lock);
        return lsr;
 }
 EXPORT_SYMBOL_GPL(serial8250_rx_chars);
 void serial8250_tx_chars(struct uart_8250_port *up)
 {
-        struct circ_buf *xmit = &up->port.state->xmit;
+        struct uart_port *port = &up->port;
+        struct circ_buf *xmit = &port->state->xmit;
        int count;
-        if (up->port.x_char) {
+        if (port->x_char) {
-                serial_outp(up, UART_TX, up->port.x_char);
+                serial_out(up, UART_TX, port->x_char);
-                up->port.icount.tx++;
+                port->icount.tx++;
-                up->port.x_char = 0;
+                port->x_char = 0;
                return;
        }
-        if (uart_tx_stopped(&up->port)) {
+        if (uart_tx_stopped(port)) {
-                serial8250_stop_tx(&up->port);
+                serial8250_stop_tx(port);
                return;
        }
        if (uart_circ_empty(xmit)) {
@@ -1486,13 +1467,13 @@ void serial8250_tx_chars(struct uart_8250_port *up)
        do {
                serial_out(up, UART_TX, xmit->buf[xmit->tail]);
                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                up->port.icount.tx++;
+                port->icount.tx++;
                if (uart_circ_empty(xmit))
                        break;
        } while (--count > 0);
        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                uart_write_wakeup(&up->port);
+                uart_write_wakeup(port);
        DEBUG_INTR("THRE...");
@@ -1503,22 +1484,23 @@ EXPORT_SYMBOL_GPL(serial8250_tx_chars);
 unsigned int serial8250_modem_status(struct uart_8250_port *up)
 {
+        struct uart_port *port = &up->port;
        unsigned int status = serial_in(up, UART_MSR);
        status |= up->msr_saved_flags;
        up->msr_saved_flags = 0;
        if (status & UART_MSR_ANY_DELTA && up->ier & UART_IER_MSI &&
-            up->port.state != NULL) {
+            port->state != NULL) {
                if (status & UART_MSR_TERI)
-                        up->port.icount.rng++;
+                        port->icount.rng++;
                if (status & UART_MSR_DDSR)
-                        up->port.icount.dsr++;
+                        port->icount.dsr++;
                if (status & UART_MSR_DDCD)
-                        uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
+                        uart_handle_dcd_change(port, status & UART_MSR_DCD);
                if (status & UART_MSR_DCTS)
-                        uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
+                        uart_handle_cts_change(port, status & UART_MSR_CTS);
-                wake_up_interruptible(&up->port.state->port.delta_msr_wait);
+                wake_up_interruptible(&port->state->port.delta_msr_wait);
        }
        return status;
@@ -1538,9 +1520,9 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
        if (iir & UART_IIR_NO_INT)
                return 0;
-        spin_lock_irqsave(&up->port.lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
-        status = serial_inp(up, UART_LSR);
+        status = serial_port_in(port, UART_LSR);
        DEBUG_INTR("status = %x...", status);
@@ -1550,16 +1532,14 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
        if (status & UART_LSR_THRE)
                serial8250_tx_chars(up);
-        spin_unlock_irqrestore(&up->port.lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
        return 1;
 }
 EXPORT_SYMBOL_GPL(serial8250_handle_irq);
 static int serial8250_default_handle_irq(struct uart_port *port)
 {
-        struct uart_8250_port *up =
+        unsigned int iir = serial_port_in(port, UART_IIR);
-                container_of(port, struct uart_8250_port, port);
-        unsigned int iir = serial_in(up, UART_IIR);
        return serial8250_handle_irq(port, iir);
 }
@@ -1750,7 +1730,7 @@ static void serial8250_backup_timeout(unsigned long data)
         * Must disable interrupts or else we risk racing with the interrupt
         * based handler.
         */
-        if (is_real_interrupt(up->port.irq)) {
+        if (up->port.irq) {
                ier = serial_in(up, UART_IER);
                serial_out(up, UART_IER, 0);
        }
@@ -1775,7 +1755,7 @@ static void serial8250_backup_timeout(unsigned long data)
        if (!(iir & UART_IIR_NO_INT))
                serial8250_tx_chars(up);
-        if (is_real_interrupt(up->port.irq))
+        if (up->port.irq)
                serial_out(up, UART_IER, ier);
        spin_unlock_irqrestore(&up->port.lock, flags);
@@ -1792,10 +1772,10 @@ static unsigned int serial8250_tx_empty(struct uart_port *port)
        unsigned long flags;
        unsigned int lsr;
-        spin_lock_irqsave(&up->port.lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
-        lsr = serial_in(up, UART_LSR);
+        lsr = serial_port_in(port, UART_LSR);
        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
-        spin_unlock_irqrestore(&up->port.lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
        return (lsr & BOTH_EMPTY) == BOTH_EMPTY ? TIOCSER_TEMT : 0;
 }
@@ -1840,7 +1820,7 @@ static void serial8250_set_mctrl(struct uart_port *port, unsigned int mctrl)
        mcr = (mcr & up->mcr_mask) | up->mcr_force | up->mcr;
-        serial_out(up, UART_MCR, mcr);
+        serial_port_out(port, UART_MCR, mcr);
 }
 static void serial8250_break_ctl(struct uart_port *port, int break_state)
@@ -1849,13 +1829,13 @@ static void serial8250_break_ctl(struct uart_port *port, int break_state)
                container_of(port, struct uart_8250_port, port);
        unsigned long flags;
-        spin_lock_irqsave(&up->port.lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
        if (break_state == -1)
                up->lcr |= UART_LCR_SBC;
        else
                up->lcr &= ~UART_LCR_SBC;
-        serial_out(up, UART_LCR, up->lcr);
+        serial_port_out(port, UART_LCR, up->lcr);
-        spin_unlock_irqrestore(&up->port.lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
 }
 /*
@@ -1900,14 +1880,12 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)
 static int serial8250_get_poll_char(struct uart_port *port)
 {
-        struct uart_8250_port *up =
+        unsigned char lsr = serial_port_in(port, UART_LSR);
-                container_of(port, struct uart_8250_port, port);
-        unsigned char lsr = serial_inp(up, UART_LSR);
        if (!(lsr & UART_LSR_DR))
                return NO_POLL_CHAR;
-        return serial_inp(up, UART_RX);
+        return serial_port_in(port, UART_RX);
 }
@@ -1921,21 +1899,21 @@ static void serial8250_put_poll_char(struct uart_port *port,
        /*
         *      First save the IER then disable the interrupts
         */
-        ier = serial_in(up, UART_IER);
+        ier = serial_port_in(port, UART_IER);
        if (up->capabilities & UART_CAP_UUE)
-                serial_out(up, UART_IER, UART_IER_UUE);
+                serial_port_out(port, UART_IER, UART_IER_UUE);
        else
-                serial_out(up, UART_IER, 0);
+                serial_port_out(port, UART_IER, 0);
        wait_for_xmitr(up, BOTH_EMPTY);
        /*
         *      Send the character out.
         *      If a LF, also do CR...
         */
-        serial_out(up, UART_TX, c);
+        serial_port_out(port, UART_TX, c);
        if (c == 10) {
                wait_for_xmitr(up, BOTH_EMPTY);
-                serial_out(up, UART_TX, 13);
+                serial_port_out(port, UART_TX, 13);
        }
        /*
@@ -1943,7 +1921,7 @@ static void serial8250_put_poll_char(struct uart_port *port,
         *      and restore the IER
         */
        wait_for_xmitr(up, BOTH_EMPTY);
-        serial_out(up, UART_IER, ier);
+        serial_port_out(port, UART_IER, ier);
 }
 #endif /* CONFIG_CONSOLE_POLL */
@@ -1956,25 +1934,25 @@ static int serial8250_startup(struct uart_port *port)
        unsigned char lsr, iir;
        int retval;
-        up->port.fifosize = uart_config[up->port.type].fifo_size;
+        port->fifosize = uart_config[up->port.type].fifo_size;
        up->tx_loadsz = uart_config[up->port.type].tx_loadsz;
        up->capabilities = uart_config[up->port.type].flags;
        up->mcr = 0;
-        if (up->port.iotype != up->cur_iotype)
+        if (port->iotype != up->cur_iotype)
                set_io_from_upio(port);
-        if (up->port.type == PORT_16C950) {
+        if (port->type == PORT_16C950) {
                /* Wake up and initialize UART */
                up->acr = 0;
-                serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
+                serial_port_out(port, UART_LCR, UART_LCR_CONF_MODE_B);
-                serial_outp(up, UART_EFR, UART_EFR_ECB);
+                serial_port_out(port, UART_EFR, UART_EFR_ECB);
-                serial_outp(up, UART_IER, 0);
+                serial_port_out(port, UART_IER, 0);
-                serial_outp(up, UART_LCR, 0);
+                serial_port_out(port, UART_LCR, 0);
                serial_icr_write(up, UART_CSR, 0); /* Reset the UART */
-                serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
+                serial_port_out(port, UART_LCR, UART_LCR_CONF_MODE_B);
-                serial_outp(up, UART_EFR, UART_EFR_ECB);
+                serial_port_out(port, UART_EFR, UART_EFR_ECB);
-                serial_outp(up, UART_LCR, 0);
+                serial_port_out(port, UART_LCR, 0);
        }
 #ifdef CONFIG_SERIAL_8250_RSA
@@ -1994,41 +1972,43 @@ static int serial8250_startup(struct uart_port *port)
        /*
         * Clear the interrupt registers.
         */
-        (void) serial_inp(up, UART_LSR);
+        serial_port_in(port, UART_LSR);
-        (void) serial_inp(up, UART_RX);
+        serial_port_in(port, UART_RX);
-        (void) serial_inp(up, UART_IIR);
+        serial_port_in(port, UART_IIR);
-        (void) serial_inp(up, UART_MSR);
+        serial_port_in(port, UART_MSR);
        /*
         * At this point, there's no way the LSR could still be 0xff;
         * if it is, then bail out, because there's likely no UART
         * here.
         */
-        if (!(up->port.flags & UPF_BUGGY_UART) &&
+        if (!(port->flags & UPF_BUGGY_UART) &&
-            (serial_inp(up, UART_LSR) == 0xff)) {
+            (serial_port_in(port, UART_LSR) == 0xff)) {
                printk_ratelimited(KERN_INFO "ttyS%d: LSR safety check engaged!\n",
-                                   serial_index(&up->port));
+                                   serial_index(port));
                return -ENODEV;
        }
        /*
         * For a XR16C850, we need to set the trigger levels
         */
-        if (up->port.type == PORT_16850) {
+        if (port->type == PORT_16850) {
                unsigned char fctr;
-                serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
+                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
-                fctr = serial_inp(up, UART_FCTR) & ~(UART_FCTR_RX|UART_FCTR_TX);
+                fctr = serial_in(up, UART_FCTR) & ~(UART_FCTR_RX|UART_FCTR_TX);
-                serial_outp(up, UART_FCTR, fctr | UART_FCTR_TRGD | UART_FCTR_RX);
+                serial_port_out(port, UART_FCTR,
-                serial_outp(up, UART_TRG, UART_TRG_96);
+                                fctr | UART_FCTR_TRGD | UART_FCTR_RX);
-                serial_outp(up, UART_FCTR, fctr | UART_FCTR_TRGD | UART_FCTR_TX);
+                serial_port_out(port, UART_TRG, UART_TRG_96);
-                serial_outp(up, UART_TRG, UART_TRG_96);
+                serial_port_out(port, UART_FCTR,
+                                fctr | UART_FCTR_TRGD | UART_FCTR_TX);
+                serial_port_out(port, UART_TRG, UART_TRG_96);
-                serial_outp(up, UART_LCR, 0);
+                serial_port_out(port, UART_LCR, 0);
        }
-        if (is_real_interrupt(up->port.irq)) {
+        if (port->irq) {
                unsigned char iir1;
                /*
                 * Test for UARTs that do not reassert THRE when the
@@ -2038,23 +2018,23 @@ static int serial8250_startup(struct uart_port *port)
                 * the interrupt is enabled.  Delays are necessary to
                 * allow register changes to become visible.
                 */
-                spin_lock_irqsave(&up->port.lock, flags);
+                spin_lock_irqsave(&port->lock, flags);
                if (up->port.irqflags & IRQF_SHARED)
-                        disable_irq_nosync(up->port.irq);
+                        disable_irq_nosync(port->irq);
                wait_for_xmitr(up, UART_LSR_THRE);
-                serial_out_sync(up, UART_IER, UART_IER_THRI);
+                serial_port_out_sync(port, UART_IER, UART_IER_THRI);
                udelay(1); /* allow THRE to set */
-                iir1 = serial_in(up, UART_IIR);
+                iir1 = serial_port_in(port, UART_IIR);
-                serial_out(up, UART_IER, 0);
+                serial_port_out(port, UART_IER, 0);
-                serial_out_sync(up, UART_IER, UART_IER_THRI);
+                serial_port_out_sync(port, UART_IER, UART_IER_THRI);
                udelay(1); /* allow a working UART time to re-assert THRE */
-                iir = serial_in(up, UART_IIR);
+                iir = serial_port_in(port, UART_IIR);
-                serial_out(up, UART_IER, 0);
+                serial_port_out(port, UART_IER, 0);
-                if (up->port.irqflags & IRQF_SHARED)
+                if (port->irqflags & IRQF_SHARED)
-                        enable_irq(up->port.irq);
+                        enable_irq(port->irq);
-                spin_unlock_irqrestore(&up->port.lock, flags);
+                spin_unlock_irqrestore(&port->lock, flags);
                /*
                 * If the interrupt is not reasserted, setup a timer to
@@ -2083,7 +2063,7 @@ static int serial8250_startup(struct uart_port *port)
         * hardware interrupt, we use a timer-based system.  The original
         * driver used to do this with IRQ0.
         */
-        if (!is_real_interrupt(up->port.irq)) {
+        if (!port->irq) {
                up->timer.data = (unsigned long)up;
                mod_timer(&up->timer, jiffies + uart_poll_timeout(port));
        } else {
@@ -2095,20 +2075,20 @@ static int serial8250_startup(struct uart_port *port)
        /*
         * Now, initialize the UART
         */
-        serial_outp(up, UART_LCR, UART_LCR_WLEN8);
+        serial_port_out(port, UART_LCR, UART_LCR_WLEN8);
-        spin_lock_irqsave(&up->port.lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
        if (up->port.flags & UPF_FOURPORT) {
-                if (!is_real_interrupt(up->port.irq))
+                if (!up->port.irq)
                        up->port.mctrl |= TIOCM_OUT1;
        } else
                /*
                 * Most PC uarts need OUT2 raised to enable interrupts.
                 */
-                if (is_real_interrupt(up->port.irq))
+                if (port->irq)
                        up->port.mctrl |= TIOCM_OUT2;
-        serial8250_set_mctrl(&up->port, up->port.mctrl);
+        serial8250_set_mctrl(port, port->mctrl);
        /* Serial over Lan (SoL) hack:
           Intel 8257x Gigabit ethernet chips have a
@@ -2128,10 +2108,10 @@ static int serial8250_startup(struct uart_port *port)
         * Do a quick test to see if we receive an
         * interrupt when we enable the TX irq.
         */
-        serial_outp(up, UART_IER, UART_IER_THRI);
+        serial_port_out(port, UART_IER, UART_IER_THRI);
-        lsr = serial_in(up, UART_LSR);
+        lsr = serial_port_in(port, UART_LSR);
-        iir = serial_in(up, UART_IIR);
+        iir = serial_port_in(port, UART_IIR);
-        serial_outp(up, UART_IER, 0);
+        serial_port_out(port, UART_IER, 0);
        if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT) {
                if (!(up->bugs & UART_BUG_TXEN)) {
@@ -2144,17 +2124,17 @@ static int serial8250_startup(struct uart_port *port)
        }
 dont_test_tx_en:
-        spin_unlock_irqrestore(&up->port.lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
        /*
         * Clear the interrupt registers again for luck, and clear the
         * saved flags to avoid getting false values from polling
         * routines or the previous session.
         */
-        serial_inp(up, UART_LSR);
+        serial_port_in(port, UART_LSR);
-        serial_inp(up, UART_RX);
+        serial_port_in(port, UART_RX);
-        serial_inp(up, UART_IIR);
+        serial_port_in(port, UART_IIR);
-        serial_inp(up, UART_MSR);
+        serial_port_in(port, UART_MSR);
        up->lsr_saved_flags = 0;
        up->msr_saved_flags = 0;
@@ -2164,16 +2144,16 @@ dont_test_tx_en:
         * anyway, so we don't enable them here.
         */
        up->ier = UART_IER_RLSI | UART_IER_RDI;
-        serial_outp(up, UART_IER, up->ier);
+        serial_port_out(port, UART_IER, up->ier);
-        if (up->port.flags & UPF_FOURPORT) {
+        if (port->flags & UPF_FOURPORT) {
                unsigned int icp;
                /*
                 * Enable interrupts on the AST Fourport board
                 */
-                icp = (up->port.iobase & 0xfe0) | 0x01f;
+                icp = (port->iobase & 0xfe0) | 0x01f;
                outb_p(0x80, icp);
-                (void) inb_p(icp);
+                inb_p(icp);
        }
        return 0;
@@ -2189,23 +2169,24 @@ static void serial8250_shutdown(struct uart_port *port)
         * Disable interrupts from this port
         */
        up->ier = 0;
-        serial_outp(up, UART_IER, 0);
+        serial_port_out(port, UART_IER, 0);
-        spin_lock_irqsave(&up->port.lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
-        if (up->port.flags & UPF_FOURPORT) {
+        if (port->flags & UPF_FOURPORT) {
                /* reset interrupts on the AST Fourport board */
-                inb((up->port.iobase & 0xfe0) | 0x1f);
+                inb((port->iobase & 0xfe0) | 0x1f);
-                up->port.mctrl |= TIOCM_OUT1;
+                port->mctrl |= TIOCM_OUT1;
        } else
-                up->port.mctrl &= ~TIOCM_OUT2;
+                port->mctrl &= ~TIOCM_OUT2;
-        serial8250_set_mctrl(&up->port, up->port.mctrl);
+        serial8250_set_mctrl(port, port->mctrl);
-        spin_unlock_irqrestore(&up->port.lock, flags);
+        spin_unlock_irqrestore(&port->lock, flags);
        /*
         * Disable break condition and FIFOs
         */
-        serial_out(up, UART_LCR, serial_inp(up, UART_LCR) & ~UART_LCR_SBC);
+        serial_port_out(port, UART_LCR,
+                        serial_port_in(port, UART_LCR) & ~UART_LCR_SBC);
        serial8250_clear_fifos(up);
 #ifdef CONFIG_SERIAL_8250_RSA
@@ -2219,11 +2200,11 @@ static void serial8250_shutdown(struct uart_port *port)
         * Read data port to reset things, and then unlink from
         * the IRQ chain.
         */
-        (void) serial_in(up, UART_RX);
+        serial_port_in(port, UART_RX);
        del_timer_sync(&up->timer);
        up->timer.function = serial8250_timeout;
-        if (is_real_interrupt(up->port.irq))
+        if (port->irq)
                serial_unlink_irq_chain(up);
 }
@@ -2298,11 +2279,11 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
        if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
                quot++;
-        if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) {
+        if (up->capabilities & UART_CAP_FIFO && port->fifosize > 1) {
                if (baud < 2400)
                        fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1;
                else
-                        fcr = uart_config[up->port.type].fcr;
+                        fcr = uart_config[port->type].fcr;
        }
        /*
@@ -2313,7 +2294,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
         * have sufficient FIFO entries for the latency of the remote
         * UART to respond.  IOW, at least 32 bytes of FIFO.
         */
-        if (up->capabilities & UART_CAP_AFE && up->port.fifosize >= 32) {
+        if (up->capabilities & UART_CAP_AFE && port->fifosize >= 32) {
                up->mcr &= ~UART_MCR_AFE;
                if (termios->c_cflag & CRTSCTS)
                        up->mcr |= UART_MCR_AFE;
@@ -2323,40 +2304,40 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
         * Ok, we're now changing the port state.  Do it with
         * interrupts disabled.
         */
-        spin_lock_irqsave(&up->port.lock, flags);
+        spin_lock_irqsave(&port->lock, flags);
        /*
         * Update the per-port timeout.
         */
        uart_update_timeout(port, termios->c_cflag, baud);
-        up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
+        port->read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
        if (termios->c_iflag & INPCK)
-                up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
+                port->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
        if (termios->c_iflag & (BRKINT | PARMRK))
-                up->port.read_status_mask |= UART_LSR_BI;
+                port->read_status_mask |= UART_LSR_BI;
        /*
         * Characteres to ignore
         */
-        up->port.ignore_status_mask = 0;
+        port->ignore_status_mask = 0;
        if (termios->c_iflag & IGNPAR)
-                up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
+                port->ignore_status_mask |= UART_LSR_PE | UART_LSR_FE;
        if (termios->c_iflag & IGNBRK) {
-                up->port.ignore_status_mask |= UART_LSR_BI;
+                port->ignore_status_mask |= UART_LSR_BI;
                /*
                 * If we're ignoring parity and break indicators,
                 * ignore overruns too (for real raw support).
                 */
                if (termios->c_iflag & IGNPAR)
-                        up->port.ignore_status_mask |= UART_LSR_OE;
+                        port->ignore_status_mask |= UART_LSR_OE;
        }
        /*
         * ignore all characters if CREAD is not set
         */
        if ((termios->c_cflag & CREAD) == 0)
-                up->port.ignore_status_mask |= UART_LSR_DR;
+                port->ignore_status_mask |= UART_LSR_DR;
        /*
         * CTS flow control flag and modem status interrupts
@@ -2370,7 +2351,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
        if (up->capabilities & UART_CAP_RTOIE)
                up->ier |= UART_IER_RTOIE;
-        serial_out(up, UART_IER, up->ier);
+        serial_port_out(port, UART_IER, up->ier);
        if (up->capabilities & UART_CAP_EFR) {
                unsigned char efr = 0;
@@ -2382,11 +2363,11 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
                if (termios->c_cflag & CRTSCTS)
                        efr |= UART_EFR_CTS;
-                serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
+                serial_port_out(port, UART_LCR, UART_LCR_CONF_MODE_B);
-                if (up->port.flags & UPF_EXAR_EFR)
+                if (port->flags & UPF_EXAR_EFR)
-                        serial_outp(up, UART_XR_EFR, efr);
+                        serial_port_out(port, UART_XR_EFR, efr);
                else
-                        serial_outp(up, UART_EFR, efr);
+                        serial_port_out(port, UART_EFR, efr);
        }
 #ifdef CONFIG_ARCH_OMAP
@@ -2394,18 +2375,20 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
        if (cpu_is_omap1510() && is_omap_port(up)) {
                if (baud == 115200) {
                        quot = 1;
-                        serial_out(up, UART_OMAP_OSC_12M_SEL, 1);
+                        serial_port_out(port, UART_OMAP_OSC_12M_SEL, 1);
                } else
-                        serial_out(up, UART_OMAP_OSC_12M_SEL, 0);
+                        serial_port_out(port, UART_OMAP_OSC_12M_SEL, 0);
        }
 #endif
-        if (up->capabilities & UART_NATSEMI) {
+        /*
-                /* Switch to bank 2 not bank 1, to avoid resetting EXCR2 */
+         * For NatSemi, switch to bank 2 not bank 1, to avoid resetting EXCR2,
-                serial_outp(up, UART_LCR, 0xe0);
+         * otherwise just set DLAB
-        } else {
+         */
-                serial_outp(up, UART_LCR, cval | UART_LCR_DLAB);/* set DLAB */
+        if (up->capabilities & UART_NATSEMI)
-        }
+                serial_port_out(port, UART_LCR, 0xe0);
+        else
+                serial_port_out(port, UART_LCR, cval | UART_LCR_DLAB);
        serial_dl_write(up, quot);
@@ -2413,20 +2396,19 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
         * LCR DLAB must be set to enable 64-byte FIFO mode. If the FCR
         * is written without DLAB set, this mode will be disabled.
         */
-        if (up->port.type == PORT_16750)
+        if (port->type == PORT_16750)
-                serial_outp(up, UART_FCR, fcr);
+                serial_port_out(port, UART_FCR, fcr);
-        serial_outp(up, UART_LCR, cval);                /* reset DLAB */
+        serial_port_out(port, UART_LCR, cval);          /* reset DLAB */
        up->lcr = cval;                                 /* Save LCR */
-        if (up->port.type != PORT_16750) {
+        if (port->type != PORT_16750) {
-                if (fcr & UART_FCR_ENABLE_FIFO) {
+                /* emulated UARTs (Lucent Venus 167x) need two steps */
-                        /* emulated UARTs (Lucent Venus 167x) need two steps */
+                if (fcr & UART_FCR_ENABLE_FIFO)
-                        serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
+                        serial_port_out(port, UART_FCR, UART_FCR_ENABLE_FIFO);
-                }
+                serial_port_out(port, UART_FCR, fcr);           /* set fcr */
-                serial_outp(up, UART_FCR, fcr);         /* set fcr */
+        }
-        }
+        serial8250_set_mctrl(port, port->mctrl);
-        serial8250_set_mctrl(&up->port, up->port.mctrl);
+        spin_unlock_irqrestore(&port->lock, flags);
-        spin_unlock_irqrestore(&up->port.lock, flags);
        /* Don't rewrite B0 */
        if (tty_termios_baud_rate(termios))
                tty_termios_encode_baud_rate(termios, baud, baud);
@@ -2491,26 +2473,26 @@ static unsigned int serial8250_port_size(struct uart_8250_port *pt)
 static int serial8250_request_std_resource(struct uart_8250_port *up)
 {
        unsigned int size = serial8250_port_size(up);
+        struct uart_port *port = &up->port;
        int ret = 0;
-        switch (up->port.iotype) {
+        switch (port->iotype) {
        case UPIO_AU:
        case UPIO_TSI:
        case UPIO_MEM32:
        case UPIO_MEM:
-                if (!up->port.mapbase)
+                if (!port->mapbase)
                        break;
-                if (!request_mem_region(up->port.mapbase, size, "serial")) {
+                if (!request_mem_region(port->mapbase, size, "serial")) {
                        ret = -EBUSY;
                        break;
                }
-                if (up->port.flags & UPF_IOREMAP) {
+                if (port->flags & UPF_IOREMAP) {
-                        up->port.membase = ioremap_nocache(up->port.mapbase,
+                        port->membase = ioremap_nocache(port->mapbase, size);
-                                                                        size);
+                        if (!port->membase) {
-                        if (!up->port.membase) {
+                                release_mem_region(port->mapbase, size);
-                                release_mem_region(up->port.mapbase, size);
                                ret = -ENOMEM;
                        }
                }
@@ -2518,7 +2500,7 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
        case UPIO_HUB6:
        case UPIO_PORT:
-                if (!request_region(up->port.iobase, size, "serial"))
+                if (!request_region(port->iobase, size, "serial"))
                        ret = -EBUSY;
                break;
        }
@@ -2528,26 +2510,27 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
 static void serial8250_release_std_resource(struct uart_8250_port *up)
 {
        unsigned int size = serial8250_port_size(up);
+        struct uart_port *port = &up->port;
-        switch (up->port.iotype) {
+        switch (port->iotype) {
        case UPIO_AU:
        case UPIO_TSI:
        case UPIO_MEM32:
        case UPIO_MEM:
-                if (!up->port.mapbase)
+                if (!port->mapbase)
                        break;
-                if (up->port.flags & UPF_IOREMAP) {
+                if (port->flags & UPF_IOREMAP) {
-                        iounmap(up->port.membase);
+                        iounmap(port->membase);
-                        up->port.membase = NULL;
+                        port->membase = NULL;
                }
-                release_mem_region(up->port.mapbase, size);
+                release_mem_region(port->mapbase, size);
                break;
        case UPIO_HUB6:
        case UPIO_PORT:
-                release_region(up->port.iobase, size);
+                release_region(port->iobase, size);
                break;
        }
 }
@@ -2556,12 +2539,13 @@ static int serial8250_request_rsa_resource(struct uart_8250_port *up)
 {
        unsigned long start = UART_RSA_BASE << up->port.regshift;
        unsigned int size = 8 << up->port.regshift;
+        struct uart_port *port = &up->port;
        int ret = -EINVAL;
-        switch (up->port.iotype) {
+        switch (port->iotype) {
        case UPIO_HUB6:
        case UPIO_PORT:
-                start += up->port.iobase;
+                start += port->iobase;
                if (request_region(start, size, "serial-rsa"))
                        ret = 0;
                else
@@ -2576,11 +2560,12 @@ static void serial8250_release_rsa_resource(struct uart_8250_port *up)
 {
        unsigned long offset = UART_RSA_BASE << up->port.regshift;
        unsigned int size = 8 << up->port.regshift;
+        struct uart_port *port = &up->port;
-        switch (up->port.iotype) {
+        switch (port->iotype) {
        case UPIO_HUB6:
        case UPIO_PORT:
-                release_region(up->port.iobase + offset, size);
+                release_region(port->iobase + offset, size);
                break;
        }
 }
@@ -2591,7 +2576,7 @@ static void serial8250_release_port(struct uart_port *port)
                container_of(port, struct uart_8250_port, port);
        serial8250_release_std_resource(up);
-        if (up->port.type == PORT_RSA)
+        if (port->type == PORT_RSA)
                serial8250_release_rsa_resource(up);
 }
@@ -2602,7 +2587,7 @@ static int serial8250_request_port(struct uart_port *port)
        int ret = 0;
        ret = serial8250_request_std_resource(up);
-        if (ret == 0 && up->port.type == PORT_RSA) {
+        if (ret == 0 && port->type == PORT_RSA) {
                ret = serial8250_request_rsa_resource(up);
                if (ret < 0)
                        serial8250_release_std_resource(up);
@@ -2630,22 +2615,22 @@ static void serial8250_config_port(struct uart_port *port, int flags)
        if (ret < 0)
                probeflags &= ~PROBE_RSA;
-        if (up->port.iotype != up->cur_iotype)
+        if (port->iotype != up->cur_iotype)
                set_io_from_upio(port);
        if (flags & UART_CONFIG_TYPE)
                autoconfig(up, probeflags);
        /* if access method is AU, it is a 16550 with a quirk */
-        if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
+        if (port->type == PORT_16550A && port->iotype == UPIO_AU)
                up->bugs |= UART_BUG_NOMSR;
-        if (up->port.type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ)
+        if (port->type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ)
                autoconfig_irq(up);
-        if (up->port.type != PORT_RSA && probeflags & PROBE_RSA)
+        if (port->type != PORT_RSA && probeflags & PROBE_RSA)
                serial8250_release_rsa_resource(up);
-        if (up->port.type == PORT_UNKNOWN)
+        if (port->type == PORT_UNKNOWN)
                serial8250_release_std_resource(up);
 }
@@ -2719,9 +2704,10 @@ static void __init serial8250_isa_init_ports(void)
        for (i = 0; i < nr_uarts; i++) {
                struct uart_8250_port *up = &serial8250_ports[i];
+                struct uart_port *port = &up->port;
-                up->port.line = i;
+                port->line = i;
-                spin_lock_init(&up->port.lock);
+                spin_lock_init(&port->lock);
                init_timer(&up->timer);
                up->timer.function = serial8250_timeout;
@@ -2732,7 +2718,7 @@ static void __init serial8250_isa_init_ports(void)
                up->mcr_mask = ~ALPHA_KLUDGE_MCR;
                up->mcr_force = ALPHA_KLUDGE_MCR;
-                up->port.ops = &serial8250_pops;
+                port->ops = &serial8250_pops;
        }
        if (share_irqs)
@@ -2741,17 +2727,19 @@ static void __init serial8250_isa_init_ports(void)
        for (i = 0, up = serial8250_ports;
             i < ARRAY_SIZE(old_serial_port) && i < nr_uarts;
             i++, up++) {
-                up->port.iobase   = old_serial_port[i].port;
+                struct uart_port *port = &up->port;
-                up->port.irq      = irq_canonicalize(old_serial_port[i].irq);
-                up->port.irqflags = old_serial_port[i].irqflags;
+                port->iobase   = old_serial_port[i].port;
-                up->port.uartclk  = old_serial_port[i].baud_base * 16;
+                port->irq      = irq_canonicalize(old_serial_port[i].irq);
-                up->port.flags    = old_serial_port[i].flags;
+                port->irqflags = old_serial_port[i].irqflags;
-                up->port.hub6     = old_serial_port[i].hub6;
+                port->uartclk  = old_serial_port[i].baud_base * 16;
-                up->port.membase  = old_serial_port[i].iomem_base;
+                port->flags    = old_serial_port[i].flags;
-                up->port.iotype   = old_serial_port[i].io_type;
+                port->hub6     = old_serial_port[i].hub6;
-                up->port.regshift = old_serial_port[i].iomem_reg_shift;
+                port->membase  = old_serial_port[i].iomem_base;
-                set_io_from_upio(&up->port);
+                port->iotype   = old_serial_port[i].io_type;
-                up->port.irqflags |= irqflag;
+                port->regshift = old_serial_port[i].iomem_reg_shift;
+                set_io_from_upio(port);
+                port->irqflags |= irqflag;
                if (serial8250_isa_config != NULL)
                        serial8250_isa_config(i, &up->port, &up->capabilities);
@@ -2799,7 +2787,7 @@ static void serial8250_console_putchar(struct uart_port *port, int ch)
                container_of(port, struct uart_8250_port, port);
        wait_for_xmitr(up, UART_LSR_THRE);
-        serial_out(up, UART_TX, ch);
+        serial_port_out(port, UART_TX, ch);
 }
 /*
@@ -2812,6 +2800,7 @@ static void
 serial8250_console_write(struct console *co, const char *s, unsigned int count)
 {
        struct uart_8250_port *up = &serial8250_ports[co->index];
+        struct uart_port *port = &up->port;
        unsigned long flags;
        unsigned int ier;
        int locked = 1;
@@ -2819,32 +2808,32 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
        touch_nmi_watchdog();
        local_irq_save(flags);
-        if (up->port.sysrq) {
+        if (port->sysrq) {
                /* serial8250_handle_irq() already took the lock */
                locked = 0;
        } else if (oops_in_progress) {
-                locked = spin_trylock(&up->port.lock);
+                locked = spin_trylock(&port->lock);
        } else
-                spin_lock(&up->port.lock);
+                spin_lock(&port->lock);
        /*
         *      First save the IER then disable the interrupts
         */
-        ier = serial_in(up, UART_IER);
+        ier = serial_port_in(port, UART_IER);
        if (up->capabilities & UART_CAP_UUE)
-                serial_out(up, UART_IER, UART_IER_UUE);
+                serial_port_out(port, UART_IER, UART_IER_UUE);
        else
-                serial_out(up, UART_IER, 0);
+                serial_port_out(port, UART_IER, 0);
-        uart_console_write(&up->port, s, count, serial8250_console_putchar);
+        uart_console_write(port, s, count, serial8250_console_putchar);
        /*
         *      Finally, wait for transmitter to become empty
         *      and restore the IER
         */
        wait_for_xmitr(up, BOTH_EMPTY);
-        serial_out(up, UART_IER, ier);
+        serial_port_out(port, UART_IER, ier);
        /*
         *      The receive handling will happen properly because the
@@ -2857,7 +2846,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
                serial8250_modem_status(up);
        if (locked)
-                spin_unlock(&up->port.lock);
+                spin_unlock(&port->lock);
        local_irq_restore(flags);
 }
@@ -3002,17 +2991,18 @@ void serial8250_suspend_port(int line)
 void serial8250_resume_port(int line)
 {
        struct uart_8250_port *up = &serial8250_ports[line];
+        struct uart_port *port = &up->port;
        if (up->capabilities & UART_NATSEMI) {
                /* Ensure it's still in high speed mode */
-                serial_outp(up, UART_LCR, 0xE0);
+                serial_port_out(port, UART_LCR, 0xE0);
                ns16550a_goto_highspeed(up);
-                serial_outp(up, UART_LCR, 0);
+                serial_port_out(port, UART_LCR, 0);
-                up->port.uartclk = 921600*16;
+                port->uartclk = 921600*16;
        }
-        uart_resume_port(&serial8250_reg, &up->port);
+        uart_resume_port(&serial8250_reg, port);
 }
 /*
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index ae027be57e25..2868a1da254d 100644
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -86,6 +86,16 @@ struct serial8250_config {
 #define SERIAL8250_SHARE_IRQS 0
 #endif
+static inline int serial_in(struct uart_8250_port *up, int offset)
+{
+        return up->port.serial_in(&up->port, offset);
+}
+static inline void serial_out(struct uart_8250_port *up, int offset, int value)
+{
+        up->port.serial_out(&up->port, offset, value);
+}
 #if defined(__alpha__) && !defined(CONFIG_PCI)
 /*
 * Digital did something really horribly wrong with the OUT1 and OUT2
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2de99248dfae..76e7764488e6 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1347,4 +1347,17 @@ config SERIAL_AR933X_NR_UARTS
          Set this to the number of serial ports you want the driver
          to support.
+config SERIAL_EFM32_UART
+        tristate "EFM32 UART/USART port."
+        depends on ARCH_EFM32
+        select SERIAL_CORE
+        help
+          This driver support the USART and UART ports on
+          Energy Micro's efm32 SoCs.
+config SERIAL_EFM32_UART_CONSOLE
+        bool "EFM32 UART/USART console support"
+        depends on SERIAL_EFM32_UART=y
+        select SERIAL_CORE_CONSOLE
 endmenu
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index fef32e10c851..7257c5d898ae 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -61,12 +61,12 @@ obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
 obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o
 obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o
+obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
 obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
 obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o
 obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o
 obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o
-obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
 obj-$(CONFIG_SERIAL_VT8500) += vt8500_serial.o
 obj-$(CONFIG_SERIAL_MRST_MAX3110)       += mrst_max3110.o
 obj-$(CONFIG_SERIAL_MFD_HSU)    += mfd.o
@@ -78,3 +78,4 @@ obj-$(CONFIG_SERIAL_LANTIQ)	+= lantiq.o
 obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
 obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o
 obj-$(CONFIG_SERIAL_AR933X)   += ar933x_uart.o
+obj-$(CONFIG_SERIAL_EFM32_UART) += efm32-uart.o
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 1d04c5037f25..e7903751e058 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -377,6 +377,26 @@ static int altera_uart_verify_port(struct uart_port *port,
        return 0;
 }
+#ifdef CONFIG_CONSOLE_POLL
+static int altera_uart_poll_get_char(struct uart_port *port)
+{
+        while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &
+                 ALTERA_UART_STATUS_RRDY_MSK))
+                cpu_relax();
+        return altera_uart_readl(port, ALTERA_UART_RXDATA_REG);
+}
+static void altera_uart_poll_put_char(struct uart_port *port, unsigned char c)
+{
+        while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &
+                 ALTERA_UART_STATUS_TRDY_MSK))
+                cpu_relax();
+        altera_uart_writel(port, c, ALTERA_UART_TXDATA_REG);
+}
+#endif
 /*
 *      Define the basic serial functions we support.
 */
@@ -397,35 +417,16 @@ static struct uart_ops altera_uart_ops = {
        .release_port   = altera_uart_release_port,
        .config_port    = altera_uart_config_port,
        .verify_port    = altera_uart_verify_port,
+#ifdef CONFIG_CONSOLE_POLL
+        .poll_get_char  = altera_uart_poll_get_char,
+        .poll_put_char  = altera_uart_poll_put_char,
+#endif
 };
 static struct altera_uart altera_uart_ports[CONFIG_SERIAL_ALTERA_UART_MAXPORTS];
 #if defined(CONFIG_SERIAL_ALTERA_UART_CONSOLE)
-int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp)
-{
-        struct uart_port *port;
-        int i;
-        for (i = 0; i < CONFIG_SERIAL_ALTERA_UART_MAXPORTS && platp[i].mapbase; i++) {
-                port = &altera_uart_ports[i].port;
-                port->line = i;
-                port->type = PORT_ALTERA_UART;
-                port->mapbase = platp[i].mapbase;
-                port->membase = ioremap(port->mapbase, ALTERA_UART_SIZE);
-                port->iotype = SERIAL_IO_MEM;
-                port->irq = platp[i].irq;
-                port->uartclk = platp[i].uartclk;
-                port->flags = UPF_BOOT_AUTOCONF;
-                port->ops = &altera_uart_ops;
-                port->private_data = platp;
-        }
-        return 0;
-}
 static void altera_uart_console_putc(struct uart_port *port, const char c)
 {
        while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 6800f5f26241..20d795d9b591 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -827,7 +827,12 @@ static void pl011_dma_rx_callback(void *data)
 {
        struct uart_amba_port *uap = data;
        struct pl011_dmarx_data *dmarx = &uap->dmarx;
+        struct dma_chan *rxchan = dmarx->chan;
        bool lastbuf = dmarx->use_buf_b;
+        struct pl011_sgbuf *sgbuf = dmarx->use_buf_b ?
+                &dmarx->sgbuf_b : &dmarx->sgbuf_a;
+        size_t pending;
+        struct dma_tx_state state;
        int ret;
        /*
@@ -838,11 +843,21 @@ static void pl011_dma_rx_callback(void *data)
         * we immediately trigger the next DMA job.
         */
        spin_lock_irq(&uap->port.lock);
+        /*
+         * Rx data can be taken by the UART interrupts during
+         * the DMA irq handler. So we check the residue here.
+         */
+        rxchan->device->device_tx_status(rxchan, dmarx->cookie, &state);
+        pending = sgbuf->sg.length - state.residue;
+        BUG_ON(pending > PL011_DMA_BUFFER_SIZE);
+        /* Then we terminate the transfer - we now know our residue */
+        dmaengine_terminate_all(rxchan);
        uap->dmarx.running = false;
        dmarx->use_buf_b = !lastbuf;
        ret = pl011_dma_rx_trigger_dma(uap);
-        pl011_dma_rx_chars(uap, PL011_DMA_BUFFER_SIZE, lastbuf, false);
+        pl011_dma_rx_chars(uap, pending, lastbuf, false);
        spin_unlock_irq(&uap->port.lock);
        /*
         * Do this check after we picked the DMA chars so we don't
@@ -1381,6 +1396,10 @@ static int pl011_startup(struct uart_port *port)
        uap->port.uartclk = clk_get_rate(uap->clk);
+        /* Clear pending error and receive interrupts */
+        writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS |
+               UART011_RTIS | UART011_RXIS, uap->port.membase + UART011_ICR);
        /*
         * Allocate the IRQ
         */
@@ -1417,10 +1436,6 @@ static int pl011_startup(struct uart_port *port)
        cr |= UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
        writew(cr, uap->port.membase + UART011_CR);
-        /* Clear pending error interrupts */
-        writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS,
-               uap->port.membase + UART011_ICR);
        /*
         * initialise the old status of the modem signals
         */
@@ -1435,6 +1450,9 @@ static int pl011_startup(struct uart_port *port)
         * as well.
         */
        spin_lock_irq(&uap->port.lock);
+        /* Clear out any spuriously appearing RX interrupts */
+         writew(UART011_RTIS | UART011_RXIS,
+                uap->port.membase + UART011_ICR);
        uap->im = UART011_RTIM;
        if (!pl011_dma_rx_running(uap))
                uap->im |= UART011_RXIM;
@@ -1927,6 +1945,10 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
                goto unmap;
        }
+        /* Ensure interrupts from this UART are masked and cleared */
+        writew(0, uap->port.membase + UART011_IMSC);
+        writew(0xffff, uap->port.membase + UART011_ICR);
        uap->vendor = vendor;
        uap->lcrh_rx = vendor->lcrh_rx;
        uap->lcrh_tx = vendor->lcrh_tx;
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 26953bfa6922..5832fdef11e9 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -535,11 +535,13 @@ static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
                 *              when start a new tx.
                 */
                UART_CLEAR_IER(uart, ETBEI);
-                xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1);
                uart->port.icount.tx += uart->tx_count;
+                if (!uart_circ_empty(xmit)) {
+                        xmit->tail = (xmit->tail + uart->tx_count) & (UART_XMIT_SIZE - 1);
-                if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                        uart_write_wakeup(&uart->port);
+                                uart_write_wakeup(&uart->port);
+                }
                bfin_serial_dma_tx_chars(uart);
        }
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 1dfba7b779c8..23d791696879 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -4105,20 +4105,11 @@ static int
 rs_open(struct tty_struct *tty, struct file * filp)
 {
        struct e100_serial      *info;
-        int                     retval, line;
+        int                     retval;
        unsigned long           page;
        int                     allocated_resources = 0;
-        /* find which port we want to open */
+        info = rs_table + tty->index;
-        line = tty->index;
-        if (line < 0 || line >= NR_PORTS)
-                return -ENODEV;
-        /* find the corresponding e100_serial struct in the table */
-        info = rs_table + line;
-        /* don't allow the opening of ports that are not enabled in the HW config */
        if (!info->enabled)
                return -ENODEV;
@@ -4131,7 +4122,7 @@ rs_open(struct tty_struct *tty, struct file * filp)
        tty->driver_data = info;
        info->port.tty = tty;
-        info->port.tty->low_latency = (info->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        tty->low_latency = !!(info->flags & ASYNC_LOW_LATENCY);
        if (!tmp_buf) {
                page = get_zeroed_page(GFP_KERNEL);
diff --git a/drivers/tty/serial/efm32-uart.c b/drivers/tty/serial/efm32-uart.c
new file mode 100644
index 000000000000..615e46470491
--- /dev/null
+++ b/drivers/tty/serial/efm32-uart.c
@@ -0,0 +1,830 @@
+#if defined(CONFIG_SERIAL_EFM32_UART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/console.h>
+#include <linux/sysrq.h>
+#include <linux/serial_core.h>
+#include <linux/tty_flip.h>
+#include <linux/slab.h>
+#include <linux/clk.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_data/efm32-uart.h>
+#define DRIVER_NAME "efm32-uart"
+#define DEV_NAME "ttyefm"
+#define UARTn_CTRL              0x00
+#define UARTn_CTRL_SYNC         0x0001
+#define UARTn_CTRL_TXBIL                0x1000
+#define UARTn_FRAME             0x04
+#define UARTn_FRAME_DATABITS__MASK      0x000f
+#define UARTn_FRAME_DATABITS(n)         ((n) - 3)
+#define UARTn_FRAME_PARITY_NONE         0x0000
+#define UARTn_FRAME_PARITY_EVEN         0x0200
+#define UARTn_FRAME_PARITY_ODD          0x0300
+#define UARTn_FRAME_STOPBITS_HALF       0x0000
+#define UARTn_FRAME_STOPBITS_ONE        0x1000
+#define UARTn_FRAME_STOPBITS_TWO        0x3000
+#define UARTn_CMD               0x0c
+#define UARTn_CMD_RXEN                  0x0001
+#define UARTn_CMD_RXDIS         0x0002
+#define UARTn_CMD_TXEN                  0x0004
+#define UARTn_CMD_TXDIS         0x0008
+#define UARTn_STATUS            0x10
+#define UARTn_STATUS_TXENS              0x0002
+#define UARTn_STATUS_TXC                0x0020
+#define UARTn_STATUS_TXBL               0x0040
+#define UARTn_STATUS_RXDATAV            0x0080
+#define UARTn_CLKDIV            0x14
+#define UARTn_RXDATAX           0x18
+#define UARTn_RXDATAX_RXDATA__MASK      0x01ff
+#define UARTn_RXDATAX_PERR              0x4000
+#define UARTn_RXDATAX_FERR              0x8000
+/*
+ * This is a software only flag used for ignore_status_mask and
+ * read_status_mask! It's used for breaks that the hardware doesn't report
+ * explicitly.
+ */
+#define SW_UARTn_RXDATAX_BERR           0x2000
+#define UARTn_TXDATA            0x34
+#define UARTn_IF                0x40
+#define UARTn_IF_TXC                    0x0001
+#define UARTn_IF_TXBL                   0x0002
+#define UARTn_IF_RXDATAV                0x0004
+#define UARTn_IF_RXOF                   0x0010
+#define UARTn_IFS               0x44
+#define UARTn_IFC               0x48
+#define UARTn_IEN               0x4c
+#define UARTn_ROUTE             0x54
+#define UARTn_ROUTE_LOCATION__MASK      0x0700
+#define UARTn_ROUTE_LOCATION(n)         (((n) << 8) & UARTn_ROUTE_LOCATION__MASK)
+#define UARTn_ROUTE_RXPEN               0x0001
+#define UARTn_ROUTE_TXPEN               0x0002
+struct efm32_uart_port {
+        struct uart_port port;
+        unsigned int txirq;
+        struct clk *clk;
+};
+#define to_efm_port(_port) container_of(_port, struct efm32_uart_port, port)
+#define efm_debug(efm_port, format, arg...)                     \
+        dev_dbg(efm_port->port.dev, format, ##arg)
+static void efm32_uart_write32(struct efm32_uart_port *efm_port,
+                u32 value, unsigned offset)
+{
+        writel_relaxed(value, efm_port->port.membase + offset);
+}
+static u32 efm32_uart_read32(struct efm32_uart_port *efm_port,
+                unsigned offset)
+{
+        return readl_relaxed(efm_port->port.membase + offset);
+}
+static unsigned int efm32_uart_tx_empty(struct uart_port *port)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        u32 status = efm32_uart_read32(efm_port, UARTn_STATUS);
+        if (status & UARTn_STATUS_TXC)
+                return TIOCSER_TEMT;
+        else
+                return 0;
+}
+static void efm32_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        /* sorry, neither handshaking lines nor loop functionallity */
+}
+static unsigned int efm32_uart_get_mctrl(struct uart_port *port)
+{
+        /* sorry, no handshaking lines available */
+        return TIOCM_CAR | TIOCM_CTS | TIOCM_DSR;
+}
+static void efm32_uart_stop_tx(struct uart_port *port)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        u32 ien = efm32_uart_read32(efm_port,  UARTn_IEN);
+        efm32_uart_write32(efm_port, UARTn_CMD_TXDIS, UARTn_CMD);
+        ien &= ~(UARTn_IF_TXC | UARTn_IF_TXBL);
+        efm32_uart_write32(efm_port, ien, UARTn_IEN);
+}
+static void efm32_uart_tx_chars(struct efm32_uart_port *efm_port)
+{
+        struct uart_port *port = &efm_port->port;
+        struct circ_buf *xmit = &port->state->xmit;
+        while (efm32_uart_read32(efm_port, UARTn_STATUS) &
+                        UARTn_STATUS_TXBL) {
+                if (port->x_char) {
+                        port->icount.tx++;
+                        efm32_uart_write32(efm_port, port->x_char,
+                                        UARTn_TXDATA);
+                        port->x_char = 0;
+                        continue;
+                }
+                if (!uart_circ_empty(xmit) && !uart_tx_stopped(port)) {
+                        port->icount.tx++;
+                        efm32_uart_write32(efm_port, xmit->buf[xmit->tail],
+                                        UARTn_TXDATA);
+                        xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                } else
+                        break;
+        }
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+        if (!port->x_char && uart_circ_empty(xmit) &&
+                        efm32_uart_read32(efm_port, UARTn_STATUS) &
+                                UARTn_STATUS_TXC)
+                efm32_uart_stop_tx(port);
+}
+static void efm32_uart_start_tx(struct uart_port *port)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        u32 ien;
+        efm32_uart_write32(efm_port,
+                        UARTn_IF_TXBL | UARTn_IF_TXC, UARTn_IFC);
+        ien = efm32_uart_read32(efm_port, UARTn_IEN);
+        efm32_uart_write32(efm_port,
+                        ien | UARTn_IF_TXBL | UARTn_IF_TXC, UARTn_IEN);
+        efm32_uart_write32(efm_port, UARTn_CMD_TXEN, UARTn_CMD);
+        efm32_uart_tx_chars(efm_port);
+}
+static void efm32_uart_stop_rx(struct uart_port *port)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        efm32_uart_write32(efm_port, UARTn_CMD_RXDIS, UARTn_CMD);
+}
+static void efm32_uart_enable_ms(struct uart_port *port)
+{
+        /* no handshake lines, no modem status interrupts */
+}
+static void efm32_uart_break_ctl(struct uart_port *port, int ctl)
+{
+        /* not possible without fiddling with gpios */
+}
+static void efm32_uart_rx_chars(struct efm32_uart_port *efm_port,
+                struct tty_struct *tty)
+{
+        struct uart_port *port = &efm_port->port;
+        while (efm32_uart_read32(efm_port, UARTn_STATUS) &
+                        UARTn_STATUS_RXDATAV) {
+                u32 rxdata = efm32_uart_read32(efm_port, UARTn_RXDATAX);
+                int flag = 0;
+                /*
+                 * This is a reserved bit and I only saw it read as 0. But to be
+                 * sure not to be confused too much by new devices adhere to the
+                 * warning in the reference manual that reserverd bits might
+                 * read as 1 in the future.
+                 */
+                rxdata &= ~SW_UARTn_RXDATAX_BERR;
+                port->icount.rx++;
+                if ((rxdata & UARTn_RXDATAX_FERR) &&
+                                !(rxdata & UARTn_RXDATAX_RXDATA__MASK)) {
+                        rxdata |= SW_UARTn_RXDATAX_BERR;
+                        port->icount.brk++;
+                        if (uart_handle_break(port))
+                                continue;
+                } else if (rxdata & UARTn_RXDATAX_PERR)
+                        port->icount.parity++;
+                else if (rxdata & UARTn_RXDATAX_FERR)
+                        port->icount.frame++;
+                rxdata &= port->read_status_mask;
+                if (rxdata & SW_UARTn_RXDATAX_BERR)
+                        flag = TTY_BREAK;
+                else if (rxdata & UARTn_RXDATAX_PERR)
+                        flag = TTY_PARITY;
+                else if (rxdata & UARTn_RXDATAX_FERR)
+                        flag = TTY_FRAME;
+                else if (uart_handle_sysrq_char(port,
+                                        rxdata & UARTn_RXDATAX_RXDATA__MASK))
+                        continue;
+                if (tty && (rxdata & port->ignore_status_mask) == 0)
+                        tty_insert_flip_char(tty,
+                                        rxdata & UARTn_RXDATAX_RXDATA__MASK, flag);
+        }
+}
+static irqreturn_t efm32_uart_rxirq(int irq, void *data)
+{
+        struct efm32_uart_port *efm_port = data;
+        u32 irqflag = efm32_uart_read32(efm_port, UARTn_IF);
+        int handled = IRQ_NONE;
+        struct uart_port *port = &efm_port->port;
+        struct tty_struct *tty;
+        spin_lock(&port->lock);
+        tty = tty_kref_get(port->state->port.tty);
+        if (irqflag & UARTn_IF_RXDATAV) {
+                efm32_uart_write32(efm_port, UARTn_IF_RXDATAV, UARTn_IFC);
+                efm32_uart_rx_chars(efm_port, tty);
+                handled = IRQ_HANDLED;
+        }
+        if (irqflag & UARTn_IF_RXOF) {
+                efm32_uart_write32(efm_port, UARTn_IF_RXOF, UARTn_IFC);
+                port->icount.overrun++;
+                if (tty)
+                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                handled = IRQ_HANDLED;
+        }
+        if (tty) {
+                tty_flip_buffer_push(tty);
+                tty_kref_put(tty);
+        }
+        spin_unlock(&port->lock);
+        return handled;
+}
+static irqreturn_t efm32_uart_txirq(int irq, void *data)
+{
+        struct efm32_uart_port *efm_port = data;
+        u32 irqflag = efm32_uart_read32(efm_port, UARTn_IF);
+        /* TXBL doesn't need to be cleared */
+        if (irqflag & UARTn_IF_TXC)
+                efm32_uart_write32(efm_port, UARTn_IF_TXC, UARTn_IFC);
+        if (irqflag & (UARTn_IF_TXC | UARTn_IF_TXBL)) {
+                efm32_uart_tx_chars(efm_port);
+                return IRQ_HANDLED;
+        } else
+                return IRQ_NONE;
+}
+static int efm32_uart_startup(struct uart_port *port)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        u32 location = 0;
+        struct efm32_uart_pdata *pdata = dev_get_platdata(port->dev);
+        int ret;
+        if (pdata)
+                location = UARTn_ROUTE_LOCATION(pdata->location);
+        ret = clk_enable(efm_port->clk);
+        if (ret) {
+                efm_debug(efm_port, "failed to enable clk\n");
+                goto err_clk_enable;
+        }
+        port->uartclk = clk_get_rate(efm_port->clk);
+        /* Enable pins at configured location */
+        efm32_uart_write32(efm_port, location | UARTn_ROUTE_RXPEN | UARTn_ROUTE_TXPEN,
+                        UARTn_ROUTE);
+        ret = request_irq(port->irq, efm32_uart_rxirq, 0,
+                        DRIVER_NAME, efm_port);
+        if (ret) {
+                efm_debug(efm_port, "failed to register rxirq\n");
+                goto err_request_irq_rx;
+        }
+        /* disable all irqs */
+        efm32_uart_write32(efm_port, 0, UARTn_IEN);
+        ret = request_irq(efm_port->txirq, efm32_uart_txirq, 0,
+                        DRIVER_NAME, efm_port);
+        if (ret) {
+                efm_debug(efm_port, "failed to register txirq\n");
+                free_irq(port->irq, efm_port);
+err_request_irq_rx:
+                clk_disable(efm_port->clk);
+        } else {
+                efm32_uart_write32(efm_port,
+                                UARTn_IF_RXDATAV | UARTn_IF_RXOF, UARTn_IEN);
+                efm32_uart_write32(efm_port, UARTn_CMD_RXEN, UARTn_CMD);
+        }
+err_clk_enable:
+        return ret;
+}
+static void efm32_uart_shutdown(struct uart_port *port)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        efm32_uart_write32(efm_port, 0, UARTn_IEN);
+        free_irq(port->irq, efm_port);
+        clk_disable(efm_port->clk);
+}
+static void efm32_uart_set_termios(struct uart_port *port,
+                struct ktermios *new, struct ktermios *old)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        unsigned long flags;
+        unsigned baud;
+        u32 clkdiv;
+        u32 frame = 0;
+        /* no modem control lines */
+        new->c_cflag &= ~(CRTSCTS | CMSPAR);
+        baud = uart_get_baud_rate(port, new, old,
+                        DIV_ROUND_CLOSEST(port->uartclk, 16 * 8192),
+                        DIV_ROUND_CLOSEST(port->uartclk, 16));
+        switch (new->c_cflag & CSIZE) {
+        case CS5:
+                frame |= UARTn_FRAME_DATABITS(5);
+                break;
+        case CS6:
+                frame |= UARTn_FRAME_DATABITS(6);
+                break;
+        case CS7:
+                frame |= UARTn_FRAME_DATABITS(7);
+                break;
+        case CS8:
+                frame |= UARTn_FRAME_DATABITS(8);
+                break;
+        }
+        if (new->c_cflag & CSTOPB)
+                /* the receiver only verifies the first stop bit */
+                frame |= UARTn_FRAME_STOPBITS_TWO;
+        else
+                frame |= UARTn_FRAME_STOPBITS_ONE;
+        if (new->c_cflag & PARENB) {
+                if (new->c_cflag & PARODD)
+                        frame |= UARTn_FRAME_PARITY_ODD;
+                else
+                        frame |= UARTn_FRAME_PARITY_EVEN;
+        } else
+                frame |= UARTn_FRAME_PARITY_NONE;
+        /*
+         * the 6 lowest bits of CLKDIV are dc, bit 6 has value 0.25.
+         * port->uartclk <= 14e6, so 4 * port->uartclk doesn't overflow.
+         */
+        clkdiv = (DIV_ROUND_CLOSEST(4 * port->uartclk, 16 * baud) - 4) << 6;
+        spin_lock_irqsave(&port->lock, flags);
+        efm32_uart_write32(efm_port,
+                        UARTn_CMD_TXDIS | UARTn_CMD_RXDIS, UARTn_CMD);
+        port->read_status_mask = UARTn_RXDATAX_RXDATA__MASK;
+        if (new->c_iflag & INPCK)
+                port->read_status_mask |=
+                        UARTn_RXDATAX_FERR | UARTn_RXDATAX_PERR;
+        if (new->c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= SW_UARTn_RXDATAX_BERR;
+        port->ignore_status_mask = 0;
+        if (new->c_iflag & IGNPAR)
+                port->ignore_status_mask |=
+                        UARTn_RXDATAX_FERR | UARTn_RXDATAX_PERR;
+        if (new->c_iflag & IGNBRK)
+                port->ignore_status_mask |= SW_UARTn_RXDATAX_BERR;
+        uart_update_timeout(port, new->c_cflag, baud);
+        efm32_uart_write32(efm_port, UARTn_CTRL_TXBIL, UARTn_CTRL);
+        efm32_uart_write32(efm_port, frame, UARTn_FRAME);
+        efm32_uart_write32(efm_port, clkdiv, UARTn_CLKDIV);
+        efm32_uart_write32(efm_port, UARTn_CMD_TXEN | UARTn_CMD_RXEN,
+                        UARTn_CMD);
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+static const char *efm32_uart_type(struct uart_port *port)
+{
+        return port->type == PORT_EFMUART ? "efm32-uart" : NULL;
+}
+static void efm32_uart_release_port(struct uart_port *port)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        clk_unprepare(efm_port->clk);
+        clk_put(efm_port->clk);
+        iounmap(port->membase);
+}
+static int efm32_uart_request_port(struct uart_port *port)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        int ret;
+        port->membase = ioremap(port->mapbase, 60);
+        if (!efm_port->port.membase) {
+                ret = -ENOMEM;
+                efm_debug(efm_port, "failed to remap\n");
+                goto err_ioremap;
+        }
+        efm_port->clk = clk_get(port->dev, NULL);
+        if (IS_ERR(efm_port->clk)) {
+                ret = PTR_ERR(efm_port->clk);
+                efm_debug(efm_port, "failed to get clock\n");
+                goto err_clk_get;
+        }
+        ret = clk_prepare(efm_port->clk);
+        if (ret) {
+                clk_put(efm_port->clk);
+err_clk_get:
+                iounmap(port->membase);
+err_ioremap:
+                return ret;
+        }
+        return 0;
+}
+static void efm32_uart_config_port(struct uart_port *port, int type)
+{
+        if (type & UART_CONFIG_TYPE &&
+                        !efm32_uart_request_port(port))
+                port->type = PORT_EFMUART;
+}
+static int efm32_uart_verify_port(struct uart_port *port,
+                struct serial_struct *serinfo)
+{
+        int ret = 0;
+        if (serinfo->type != PORT_UNKNOWN && serinfo->type != PORT_EFMUART)
+                ret = -EINVAL;
+        return ret;
+}
+static struct uart_ops efm32_uart_pops = {
+        .tx_empty = efm32_uart_tx_empty,
+        .set_mctrl = efm32_uart_set_mctrl,
+        .get_mctrl = efm32_uart_get_mctrl,
+        .stop_tx = efm32_uart_stop_tx,
+        .start_tx = efm32_uart_start_tx,
+        .stop_rx = efm32_uart_stop_rx,
+        .enable_ms = efm32_uart_enable_ms,
+        .break_ctl = efm32_uart_break_ctl,
+        .startup = efm32_uart_startup,
+        .shutdown = efm32_uart_shutdown,
+        .set_termios = efm32_uart_set_termios,
+        .type = efm32_uart_type,
+        .release_port = efm32_uart_release_port,
+        .request_port = efm32_uart_request_port,
+        .config_port = efm32_uart_config_port,
+        .verify_port = efm32_uart_verify_port,
+};
+static struct efm32_uart_port *efm32_uart_ports[5];
+#ifdef CONFIG_SERIAL_EFM32_UART_CONSOLE
+static void efm32_uart_console_putchar(struct uart_port *port, int ch)
+{
+        struct efm32_uart_port *efm_port = to_efm_port(port);
+        unsigned int timeout = 0x400;
+        u32 status;
+        while (1) {
+                status = efm32_uart_read32(efm_port, UARTn_STATUS);
+                if (status & UARTn_STATUS_TXBL)
+                        break;
+                if (!timeout--)
+                        return;
+        }
+        efm32_uart_write32(efm_port, ch, UARTn_TXDATA);
+}
+static void efm32_uart_console_write(struct console *co, const char *s,
+                unsigned int count)
+{
+        struct efm32_uart_port *efm_port = efm32_uart_ports[co->index];
+        u32 status = efm32_uart_read32(efm_port, UARTn_STATUS);
+        unsigned int timeout = 0x400;
+        if (!(status & UARTn_STATUS_TXENS))
+                efm32_uart_write32(efm_port, UARTn_CMD_TXEN, UARTn_CMD);
+        uart_console_write(&efm_port->port, s, count,
+                        efm32_uart_console_putchar);
+        /* Wait for the transmitter to become empty */
+        while (1) {
+                u32 status = efm32_uart_read32(efm_port, UARTn_STATUS);
+                if (status & UARTn_STATUS_TXC)
+                        break;
+                if (!timeout--)
+                        break;
+        }
+        if (!(status & UARTn_STATUS_TXENS))
+                efm32_uart_write32(efm_port, UARTn_CMD_TXDIS, UARTn_CMD);
+}
+static void efm32_uart_console_get_options(struct efm32_uart_port *efm_port,
+                int *baud, int *parity, int *bits)
+{
+        u32 ctrl = efm32_uart_read32(efm_port, UARTn_CTRL);
+        u32 route, clkdiv, frame;
+        if (ctrl & UARTn_CTRL_SYNC)
+                /* not operating in async mode */
+                return;
+        route = efm32_uart_read32(efm_port, UARTn_ROUTE);
+        if (!(route & UARTn_ROUTE_TXPEN))
+                /* tx pin not routed */
+                return;
+        clkdiv = efm32_uart_read32(efm_port, UARTn_CLKDIV);
+        *baud = DIV_ROUND_CLOSEST(4 * efm_port->port.uartclk,
+                        16 * (4 + (clkdiv >> 6)));
+        frame = efm32_uart_read32(efm_port, UARTn_FRAME);
+        if (frame & UARTn_FRAME_PARITY_ODD)
+                *parity = 'o';
+        else if (frame & UARTn_FRAME_PARITY_EVEN)
+                *parity = 'e';
+        else
+                *parity = 'n';
+        *bits = (frame & UARTn_FRAME_DATABITS__MASK) -
+                        UARTn_FRAME_DATABITS(4) + 4;
+        efm_debug(efm_port, "get_opts: options=%d%c%d\n",
+                        *baud, *parity, *bits);
+}
+static int efm32_uart_console_setup(struct console *co, char *options)
+{
+        struct efm32_uart_port *efm_port;
+        int baud = 115200;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+        int ret;
+        if (co->index < 0 || co->index >= ARRAY_SIZE(efm32_uart_ports)) {
+                unsigned i;
+                for (i = 0; i < ARRAY_SIZE(efm32_uart_ports); ++i) {
+                        if (efm32_uart_ports[i]) {
+                                pr_warn("efm32-console: fall back to console index %u (from %hhi)\n",
+                                                i, co->index);
+                                co->index = i;
+                                break;
+                        }
+                }
+        }
+        efm_port = efm32_uart_ports[co->index];
+        if (!efm_port) {
+                pr_warn("efm32-console: No port at %d\n", co->index);
+                return -ENODEV;
+        }
+        ret = clk_prepare(efm_port->clk);
+        if (ret) {
+                dev_warn(efm_port->port.dev,
+                                "console: clk_prepare failed: %d\n", ret);
+                return ret;
+        }
+        efm_port->port.uartclk = clk_get_rate(efm_port->clk);
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        else
+                efm32_uart_console_get_options(efm_port,
+                                &baud, &parity, &bits);
+        return uart_set_options(&efm_port->port, co, baud, parity, bits, flow);
+}
+static struct uart_driver efm32_uart_reg;
+static struct console efm32_uart_console = {
+        .name = DEV_NAME,
+        .write = efm32_uart_console_write,
+        .device = uart_console_device,
+        .setup = efm32_uart_console_setup,
+        .flags = CON_PRINTBUFFER,
+        .index = -1,
+        .data = &efm32_uart_reg,
+};
+#else
+#define efm32_uart_console (*(struct console *)NULL)
+#endif /* ifdef CONFIG_SERIAL_EFM32_UART_CONSOLE / else */
+static struct uart_driver efm32_uart_reg = {
+        .owner = THIS_MODULE,
+        .driver_name = DRIVER_NAME,
+        .dev_name = DEV_NAME,
+        .nr = ARRAY_SIZE(efm32_uart_ports),
+        .cons = &efm32_uart_console,
+};
+static int efm32_uart_probe_dt(struct platform_device *pdev,
+                struct efm32_uart_port *efm_port)
+{
+        struct device_node *np = pdev->dev.of_node;
+        int ret;
+        if (!np)
+                return 1;
+        ret = of_alias_get_id(np, "serial");
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to get alias id: %d\n", ret);
+                return ret;
+        } else {
+                efm_port->port.line = ret;
+                return 0;
+        }
+}
+static int __devinit efm32_uart_probe(struct platform_device *pdev)
+{
+        struct efm32_uart_port *efm_port;
+        struct resource *res;
+        int ret;
+        efm_port = kzalloc(sizeof(*efm_port), GFP_KERNEL);
+        if (!efm_port) {
+                dev_dbg(&pdev->dev, "failed to allocate private data\n");
+                return -ENOMEM;
+        }
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                ret = -ENODEV;
+                dev_dbg(&pdev->dev, "failed to determine base address\n");
+                goto err_get_base;
+        }
+        if (resource_size(res) < 60) {
+                ret = -EINVAL;
+                dev_dbg(&pdev->dev, "memory resource too small\n");
+                goto err_too_small;
+        }
+        ret = platform_get_irq(pdev, 0);
+        if (ret <= 0) {
+                dev_dbg(&pdev->dev, "failed to get rx irq\n");
+                goto err_get_rxirq;
+        }
+        efm_port->port.irq = ret;
+        ret = platform_get_irq(pdev, 1);
+        if (ret <= 0)
+                ret = efm_port->port.irq + 1;
+        efm_port->txirq = ret;
+        efm_port->port.dev = &pdev->dev;
+        efm_port->port.mapbase = res->start;
+        efm_port->port.type = PORT_EFMUART;
+        efm_port->port.iotype = UPIO_MEM32;
+        efm_port->port.fifosize = 2;
+        efm_port->port.ops = &efm32_uart_pops;
+        efm_port->port.flags = UPF_BOOT_AUTOCONF;
+        ret = efm32_uart_probe_dt(pdev, efm_port);
+        if (ret > 0)
+                /* not created by device tree */
+                efm_port->port.line = pdev->id;
+        if (efm_port->port.line >= 0 &&
+                        efm_port->port.line < ARRAY_SIZE(efm32_uart_ports))
+                efm32_uart_ports[efm_port->port.line] = efm_port;
+        ret = uart_add_one_port(&efm32_uart_reg, &efm_port->port);
+        if (ret) {
+                dev_dbg(&pdev->dev, "failed to add port: %d\n", ret);
+                if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(efm32_uart_ports))
+                        efm32_uart_ports[pdev->id] = NULL;
+err_get_rxirq:
+err_too_small:
+err_get_base:
+                kfree(efm_port);
+        } else {
+                platform_set_drvdata(pdev, efm_port);
+                dev_dbg(&pdev->dev, "\\o/\n");
+        }
+        return ret;
+}
+static int __devexit efm32_uart_remove(struct platform_device *pdev)
+{
+        struct efm32_uart_port *efm_port = platform_get_drvdata(pdev);
+        platform_set_drvdata(pdev, NULL);
+        uart_remove_one_port(&efm32_uart_reg, &efm_port->port);
+        if (pdev->id >= 0 && pdev->id < ARRAY_SIZE(efm32_uart_ports))
+                efm32_uart_ports[pdev->id] = NULL;
+        kfree(efm_port);
+        return 0;
+}
+static struct of_device_id efm32_uart_dt_ids[] = {
+        {
+                .compatible = "efm32,uart",
+        }, {
+                /* sentinel */
+        }
+};
+MODULE_DEVICE_TABLE(of, efm32_uart_dt_ids);
+static struct platform_driver efm32_uart_driver = {
+        .probe = efm32_uart_probe,
+        .remove = __devexit_p(efm32_uart_remove),
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = efm32_uart_dt_ids,
+        },
+};
+static int __init efm32_uart_init(void)
+{
+        int ret;
+        ret = uart_register_driver(&efm32_uart_reg);
+        if (ret)
+                return ret;
+        ret = platform_driver_register(&efm32_uart_driver);
+        if (ret)
+                uart_unregister_driver(&efm32_uart_reg);
+        pr_info("EFM32 UART/USART driver\n");
+        return ret;
+}
+module_init(efm32_uart_init);
+static void __exit efm32_uart_exit(void)
+{
+        platform_driver_unregister(&efm32_uart_driver);
+        uart_unregister_driver(&efm32_uart_reg);
+}
+MODULE_AUTHOR("Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>");
+MODULE_DESCRIPTION("EFM32 UART/USART driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 7e925e20cbaa..144cd3987d4c 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -1375,12 +1375,9 @@ static int __init ifx_spi_init(void)
                return -ENOMEM;
        }
-        tty_drv->magic = TTY_DRIVER_MAGIC;
-        tty_drv->owner = THIS_MODULE;
        tty_drv->driver_name = DRVNAME;
        tty_drv->name = TTYNAME;
        tty_drv->minor_start = IFX_SPI_TTY_ID;
-        tty_drv->num = 1;
        tty_drv->type = TTY_DRIVER_TYPE_SERIAL;
        tty_drv->subtype = SERIAL_TYPE_NORMAL;
        tty_drv->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
index 6b36c1554d7e..e16894fb2ca3 100644
--- a/drivers/tty/serial/ioc4_serial.c
+++ b/drivers/tty/serial/ioc4_serial.c
@@ -16,7 +16,6 @@
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/serial.h>
-#include <linux/serialP.h>
 #include <linux/circ_buf.h>
 #include <linux/serial_reg.h>
 #include <linux/module.h>
@@ -975,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
        BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
               || (type == IOC4_OTHER_INTR_TYPE)));
-        i = atomic_inc(&soft-> is_intr_type[type].is_num_intrs) - 1;
+        i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
        BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
        /* Save off the lower level interrupt handler */
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 94a6792bf97b..a0703624d5e5 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -38,7 +38,6 @@
 #include <linux/console.h>
 #include <linux/sysrq.h>
 #include <linux/serial.h>
-#include <linux/serialP.h>
 #include <linux/delay.h>
 #include <asm/m32r.h>
@@ -70,13 +69,6 @@
 #define PASS_LIMIT      256
-/*
- * We default to IRQ0 for the "no irq" hack.   Some
- * machine types want others as well - they're free
- * to redefine this in their header file.
- */
-#define is_real_interrupt(irq)  ((irq) != 0)
 #define BASE_BAUD       115200
 /* Standard COM flags */
@@ -640,7 +632,7 @@ static int m32r_sio_startup(struct uart_port *port)
         * hardware interrupt, we use a timer-based system.  The original
         * driver used to do this with IRQ0.
         */
-        if (!is_real_interrupt(up->port.irq)) {
+        if (!up->port.irq) {
                unsigned int timeout = up->port.timeout;
                timeout = timeout > 6 ? (timeout / 2 - 2) : 1;
@@ -687,7 +679,7 @@ static void m32r_sio_shutdown(struct uart_port *port)
        sio_init();
-        if (!is_real_interrupt(up->port.irq))
+        if (!up->port.irq)
                del_timer_sync(&up->timer);
        else
                serial_unlink_irq_chain(up);
diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/m32r_sio.h
index e9b7e11793b1..8129824496c6 100644
--- a/drivers/tty/serial/m32r_sio.h
+++ b/drivers/tty/serial/m32r_sio.h
@@ -15,6 +15,7 @@
 * (at your option) any later version.
 */
+#include <linux/pci.h>
 struct m32r_sio_probe {
        struct module   *owner;
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 1093a88a1fe3..bedac0d4c9ce 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -262,8 +262,9 @@ static unsigned int mpc5200b_psc_set_baudrate(struct uart_port *port,
                                  port->uartclk / 4);
        divisor = (port->uartclk + 2 * baud) / (4 * baud);
-        /* select the proper prescaler and set the divisor */
+        /* select the proper prescaler and set the divisor
-        if (divisor > 0xffff) {
+         * prefer high prescaler for more tolerance on low baudrates */
+        if (divisor > 0xffff || baud <= 115200) {
                divisor = (divisor + 4) / 8;
                prescaler = 0xdd00; /* /32 */
        } else
@@ -507,7 +508,7 @@ static int __init mpc512x_psc_fifoc_init(void)
        psc_fifoc_irq = irq_of_parse_and_map(np, 0);
        of_node_put(np);
-        if (psc_fifoc_irq == NO_IRQ) {
+        if (psc_fifoc_irq == 0) {
                pr_err("%s: Can't get FIFOC irq\n", __func__);
                iounmap(psc_fifoc);
                return -ENODEV;
@@ -1354,7 +1355,7 @@ static int __devinit mpc52xx_uart_of_probe(struct platform_device *op)
        }
        psc_ops->get_irq(port, op->dev.of_node);
-        if (port->irq == NO_IRQ) {
+        if (port->irq == 0) {
                dev_dbg(&op->dev, "Could not get irq\n");
                return -EINVAL;
        }
diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c
index 4f41dcdcb771..b25e6ee71443 100644
--- a/drivers/tty/serial/msm_smd_tty.c
+++ b/drivers/tty/serial/msm_smd_tty.c
@@ -203,7 +203,6 @@ static int __init smd_tty_init(void)
        if (smd_tty_driver == 0)
                return -ENOMEM;
-        smd_tty_driver->owner = THIS_MODULE;
        smd_tty_driver->driver_name = "smd_tty_driver";
        smd_tty_driver->name = "smd";
        smd_tty_driver->major = 0;
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c
index 06f6aefd5ba6..7ea8a263fd9e 100644
--- a/drivers/tty/serial/mux.c
+++ b/drivers/tty/serial/mux.c
@@ -17,7 +17,6 @@
 */
 #include <linux/module.h>
-#include <linux/tty.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/serial.h>
@@ -499,7 +498,7 @@ static int __init mux_probe(struct parisc_device *dev)
                port->membase   = ioremap_nocache(port->mapbase, MUX_LINE_OFFSET);
                port->iotype    = UPIO_MEM;
                port->type      = PORT_MUX;
-                port->irq       = NO_IRQ;
+                port->irq       = 0;
                port->uartclk   = 0;
                port->fifosize  = MUX_FIFO_SIZE;
                port->ops       = &mux_pops;
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index f80904145fd4..0121486ac4fa 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -159,7 +159,7 @@ static void serial_omap_stop_tx(struct uart_port *port)
                serial_out(up, UART_IER, up->ier);
        }
-        if (!up->use_dma && pdata->set_forceidle)
+        if (!up->use_dma && pdata && pdata->set_forceidle)
                pdata->set_forceidle(up->pdev);
        pm_runtime_mark_last_busy(&up->pdev->dev);
@@ -298,7 +298,7 @@ static void serial_omap_start_tx(struct uart_port *port)
        if (!up->use_dma) {
                pm_runtime_get_sync(&up->pdev->dev);
                serial_omap_enable_ier_thri(up);
-                if (pdata->set_noidle)
+                if (pdata && pdata->set_noidle)
                        pdata->set_noidle(up->pdev);
                pm_runtime_mark_last_busy(&up->pdev->dev);
                pm_runtime_put_autosuspend(&up->pdev->dev);
@@ -1613,7 +1613,7 @@ static int serial_omap_runtime_resume(struct device *dev)
        struct uart_omap_port *up = dev_get_drvdata(dev);
        struct omap_uart_port_info *pdata = dev->platform_data;
-        if (up) {
+        if (up && pdata) {
                if (pdata->get_context_loss_count) {
                        u32 loss_cnt = pdata->get_context_loss_count(dev);
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 17ae65762d1a..332f2eb8abbc 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -29,6 +29,7 @@
 #include <linux/nmi.h>
 #include <linux/delay.h>
+#include <linux/debugfs.h>
 #include <linux/dmaengine.h>
 #include <linux/pch_dma.h>
@@ -144,6 +145,8 @@ enum {
 #define PCH_UART_DLL            0x00
 #define PCH_UART_DLM            0x01
+#define PCH_UART_BRCSR          0x0E
 #define PCH_UART_IID_RLS        (PCH_UART_IIR_REI)
 #define PCH_UART_IID_RDR        (PCH_UART_IIR_RRI)
 #define PCH_UART_IID_RDR_TO     (PCH_UART_IIR_RRI | PCH_UART_IIR_TOI)
@@ -203,7 +206,10 @@ enum {
 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-#define DEFAULT_BAUD_RATE 1843200 /* 1.8432MHz */
+#define DEFAULT_UARTCLK   1843200 /*   1.8432 MHz */
+#define CMITC_UARTCLK   192000000 /* 192.0000 MHz */
+#define FRI2_64_UARTCLK  64000000 /*  64.0000 MHz */
+#define FRI2_48_UARTCLK  48000000 /*  48.0000 MHz */
 struct pch_uart_buffer {
        unsigned char *buf;
@@ -218,7 +224,7 @@ struct eg20t_port {
        unsigned int iobase;
        struct pci_dev *pdev;
        int fifo_size;
-        int base_baud;
+        int uartclk;
        int start_tx;
        int start_rx;
        int tx_empty;
@@ -243,6 +249,8 @@ struct eg20t_port {
        int                             tx_dma_use;
        void                            *rx_buf_virt;
        dma_addr_t                      rx_buf_dma;
+        struct dentry   *debugfs;
 };
 /**
@@ -287,26 +295,100 @@ static struct pch_uart_driver_data drv_dat[] = {
 static struct eg20t_port *pch_uart_ports[PCH_UART_NR];
 #endif
 static unsigned int default_baud = 9600;
+static unsigned int user_uartclk = 0;
 static const int trigger_level_256[4] = { 1, 64, 128, 224 };
 static const int trigger_level_64[4] = { 1, 16, 32, 56 };
 static const int trigger_level_16[4] = { 1, 4, 8, 14 };
 static const int trigger_level_1[4] = { 1, 1, 1, 1 };
-static void pch_uart_hal_request(struct pci_dev *pdev, int fifosize,
+#ifdef CONFIG_DEBUG_FS
-                                 int base_baud)
+#define PCH_REGS_BUFSIZE        1024
+static int pch_show_regs_open(struct inode *inode, struct file *file)
 {
-        struct eg20t_port *priv = pci_get_drvdata(pdev);
+        file->private_data = inode->i_private;
+        return 0;
+}
-        priv->trigger_level = 1;
+static ssize_t port_show_regs(struct file *file, char __user *user_buf,
-        priv->fcr = 0;
+                                size_t count, loff_t *ppos)
+{
+        struct eg20t_port *priv = file->private_data;
+        char *buf;
+        u32 len = 0;
+        ssize_t ret;
+        unsigned char lcr;
+        buf = kzalloc(PCH_REGS_BUFSIZE, GFP_KERNEL);
+        if (!buf)
+                return 0;
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "PCH EG20T port[%d] regs:\n", priv->port.line);
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "=================================\n");
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "IER: \t0x%02x\n", ioread8(priv->membase + UART_IER));
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "IIR: \t0x%02x\n", ioread8(priv->membase + UART_IIR));
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "LCR: \t0x%02x\n", ioread8(priv->membase + UART_LCR));
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "MCR: \t0x%02x\n", ioread8(priv->membase + UART_MCR));
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "LSR: \t0x%02x\n", ioread8(priv->membase + UART_LSR));
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "MSR: \t0x%02x\n", ioread8(priv->membase + UART_MSR));
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "BRCSR: \t0x%02x\n",
+                        ioread8(priv->membase + PCH_UART_BRCSR));
+        lcr = ioread8(priv->membase + UART_LCR);
+        iowrite8(PCH_UART_LCR_DLAB, priv->membase + UART_LCR);
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "DLL: \t0x%02x\n", ioread8(priv->membase + UART_DLL));
+        len += snprintf(buf + len, PCH_REGS_BUFSIZE - len,
+                        "DLM: \t0x%02x\n", ioread8(priv->membase + UART_DLM));
+        iowrite8(lcr, priv->membase + UART_LCR);
+        if (len > PCH_REGS_BUFSIZE)
+                len = PCH_REGS_BUFSIZE;
+        ret =  simple_read_from_buffer(user_buf, count, ppos, buf, len);
+        kfree(buf);
+        return ret;
 }
-static unsigned int get_msr(struct eg20t_port *priv, void __iomem *base)
+static const struct file_operations port_regs_ops = {
+        .owner          = THIS_MODULE,
+        .open           = pch_show_regs_open,
+        .read           = port_show_regs,
+        .llseek         = default_llseek,
+};
+#endif  /* CONFIG_DEBUG_FS */
+/* Return UART clock, checking for board specific clocks. */
+static int pch_uart_get_uartclk(void)
 {
-        unsigned int msr = ioread8(base + UART_MSR);
+        const char *cmp;
-        priv->dmsr |= msr & PCH_UART_MSR_DELTA;
+        if (user_uartclk)
+                return user_uartclk;
+        cmp = dmi_get_system_info(DMI_BOARD_NAME);
+        if (cmp && strstr(cmp, "CM-iTC"))
+                return CMITC_UARTCLK;
+        cmp = dmi_get_system_info(DMI_BIOS_VERSION);
+        if (cmp && strnstr(cmp, "FRI2", 4))
+                return FRI2_64_UARTCLK;
+        cmp = dmi_get_system_info(DMI_PRODUCT_NAME);
+        if (cmp && strstr(cmp, "Fish River Island II"))
+                return FRI2_48_UARTCLK;
-        return msr;
+        return DEFAULT_UARTCLK;
 }
 static void pch_uart_hal_enable_interrupt(struct eg20t_port *priv,
@@ -332,7 +414,7 @@ static int pch_uart_hal_set_line(struct eg20t_port *priv, int baud,
        unsigned int dll, dlm, lcr;
        int div;
-        div = DIV_ROUND_CLOSEST(priv->base_baud / 16, baud);
+        div = DIV_ROUND_CLOSEST(priv->uartclk / 16, baud);
        if (div < 0 || USHRT_MAX <= div) {
                dev_err(priv->port.dev, "Invalid Baud(div=0x%x)\n", div);
                return -EINVAL;
@@ -442,8 +524,9 @@ static int pch_uart_hal_set_fifo(struct eg20t_port *priv,
 static u8 pch_uart_hal_get_modem(struct eg20t_port *priv)
 {
-        priv->dmsr = 0;
+        unsigned int msr = ioread8(priv->membase + UART_MSR);
-        return get_msr(priv, priv->membase);
+        priv->dmsr = msr & PCH_UART_MSR_DELTA;
+        return (u8)msr;
 }
 static void pch_uart_hal_write(struct eg20t_port *priv,
@@ -524,7 +607,7 @@ static int push_rx(struct eg20t_port *priv, const unsigned char *buf,
 static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf)
 {
-        int ret;
+        int ret = 0;
        struct uart_port *port = &priv->port;
        if (port->x_char) {
@@ -533,8 +616,6 @@ static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf)
                buf[0] = port->x_char;
                port->x_char = 0;
                ret = 1;
-        } else {
-                ret = 0;
        }
        return ret;
@@ -1032,14 +1113,12 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)
 static unsigned int pch_uart_tx_empty(struct uart_port *port)
 {
        struct eg20t_port *priv;
-        int ret;
        priv = container_of(port, struct eg20t_port, port);
        if (priv->tx_empty)
-                ret = TIOCSER_TEMT;
+                return TIOCSER_TEMT;
        else
-                ret = 0;
+                return 0;
-        return ret;
 }
 /* Returns the current state of modem control inputs. */
@@ -1153,9 +1232,9 @@ static int pch_uart_startup(struct uart_port *port)
        priv->tx_empty = 1;
        if (port->uartclk)
-                priv->base_baud = port->uartclk;
+                priv->uartclk = port->uartclk;
        else
-                port->uartclk = priv->base_baud;
+                port->uartclk = priv->uartclk;
        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_ALL_INT);
        ret = pch_uart_hal_set_line(priv, default_baud,
@@ -1273,9 +1352,8 @@ static void pch_uart_set_termios(struct uart_port *port,
                else
                        parity = PCH_UART_HAL_PARITY_EVEN;
-        } else {
+        } else
                parity = PCH_UART_HAL_PARITY_NONE;
-        }
        /* Only UART0 has auto hardware flow function */
        if ((termios->c_cflag & CRTSCTS) && (priv->fifo_size == 256))
@@ -1447,7 +1525,6 @@ static void
 pch_console_write(struct console *co, const char *s, unsigned int count)
 {
        struct eg20t_port *priv;
        unsigned long flags;
        u8 ier;
        int locked = 1;
@@ -1489,7 +1566,7 @@ pch_console_write(struct console *co, const char *s, unsigned int count)
 static int __init pch_console_setup(struct console *co, char *options)
 {
        struct uart_port *port;
-        int baud = 9600;
+        int baud = default_baud;
        int bits = 8;
        int parity = 'n';
        int flow = 'n';
@@ -1506,8 +1583,7 @@ static int __init pch_console_setup(struct console *co, char *options)
        if (!port || (!port->iobase && !port->membase))
                return -ENODEV;
-        /* setup uartclock */
+        port->uartclk = pch_uart_get_uartclk();
-        port->uartclk = DEFAULT_BAUD_RATE;
        if (options)
                uart_parse_options(options, &baud, &parity, &bits, &flow);
@@ -1550,10 +1626,10 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        unsigned int iobase;
        unsigned int mapbase;
        unsigned char *rxbuf;
-        int fifosize, base_baud;
+        int fifosize;
        int port_type;
        struct pch_uart_driver_data *board;
-        const char *board_name;
+        char name[32];  /* for debugfs file name */
        board = &drv_dat[id->driver_data];
        port_type = board->port_type;
@@ -1566,13 +1642,6 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        if (!rxbuf)
                goto init_port_free_txbuf;
-        base_baud = DEFAULT_BAUD_RATE;
-        /* quirk for CM-iTC board */
-        board_name = dmi_get_system_info(DMI_BOARD_NAME);
-        if (board_name && strstr(board_name, "CM-iTC"))
-                base_baud = 192000000; /* 192.0MHz */
        switch (port_type) {
        case PORT_UNKNOWN:
                fifosize = 256; /* EG20T/ML7213: UART0 */
@@ -1597,7 +1666,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        priv->rxbuf.size = PAGE_SIZE;
        priv->fifo_size = fifosize;
-        priv->base_baud = base_baud;
+        priv->uartclk = pch_uart_get_uartclk();
        priv->port_type = PORT_MAX_8250 + port_type + 1;
        priv->port.dev = &pdev->dev;
        priv->port.iobase = iobase;
@@ -1614,7 +1683,8 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        spin_lock_init(&priv->port.lock);
        pci_set_drvdata(pdev, priv);
-        pch_uart_hal_request(pdev, fifosize, base_baud);
+        priv->trigger_level = 1;
+        priv->fcr = 0;
 #ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
        pch_uart_ports[board->line_no] = priv;
@@ -1623,6 +1693,12 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
        if (ret < 0)
                goto init_port_hal_free;
+#ifdef CONFIG_DEBUG_FS
+        snprintf(name, sizeof(name), "uart%d_regs", board->line_no);
+        priv->debugfs = debugfs_create_file(name, S_IFREG | S_IRUGO,
+                                NULL, priv, &port_regs_ops);
+#endif
        return priv;
 init_port_hal_free:
@@ -1639,6 +1715,11 @@ init_port_alloc_err:
 static void pch_uart_exit_port(struct eg20t_port *priv)
 {
+#ifdef CONFIG_DEBUG_FS
+        if (priv->debugfs)
+                debugfs_remove(priv->debugfs);
+#endif
        uart_remove_one_port(&pch_uart_driver, &priv->port);
        pci_set_drvdata(priv->pdev, NULL);
        free_page((unsigned long)priv->rxbuf.buf);
@@ -1646,9 +1727,7 @@ static void pch_uart_exit_port(struct eg20t_port *priv)
 static void pch_uart_pci_remove(struct pci_dev *pdev)
 {
-        struct eg20t_port *priv;
+        struct eg20t_port *priv = pci_get_drvdata(pdev);
-        priv = (struct eg20t_port *)pci_get_drvdata(pdev);
        pci_disable_msi(pdev);
@@ -1785,3 +1864,8 @@ module_exit(pch_uart_module_exit);
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Intel EG20T PCH UART PCI Driver");
 module_param(default_baud, uint, S_IRUGO);
+MODULE_PARM_DESC(default_baud,
+                 "Default BAUD for initial driver state and console (default 9600)");
+module_param(user_uartclk, uint, S_IRUGO);
+MODULE_PARM_DESC(user_uartclk,
+                 "Override UART default or board specific UART clock");
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index e9c2dfe471a2..08ebe901bb59 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1506,7 +1506,7 @@ no_dma:
         * fixed up interrupt info, but we use the device-tree directly
         * here due to early probing so we need the fixup too.
         */
-        if (uap->port.irq == NO_IRQ &&
+        if (uap->port.irq == 0 &&
            np->parent && np->parent->parent &&
            of_device_is_compatible(np->parent->parent, "gatwick")) {
                /* IRQs on gatwick are offset by 64 */
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 5c8e3bba6c84..e2fd3d8e0ab4 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -579,9 +579,9 @@ serial_pxa_pm(struct uart_port *port, unsigned int state,
        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
        if (!state)
-                clk_enable(up->clk);
+                clk_prepare_enable(up->clk);
        else
-                clk_disable(up->clk);
+                clk_disable_unprepare(up->clk);
 }
 static void serial_pxa_release_port(struct uart_port *port)
@@ -668,7 +668,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
        struct uart_pxa_port *up = serial_pxa_ports[co->index];
        unsigned int ier;
-        clk_enable(up->clk);
+        clk_prepare_enable(up->clk);
        /*
         *      First save the IER then disable the interrupts
@@ -685,7 +685,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
        wait_for_xmitr(up);
        serial_out(up, UART_IER, ier);
-        clk_disable(up->clk);
+        clk_disable_unprepare(up->clk);
 }
 static int __init
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index c55e5fb16fa3..de249d265bec 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1507,7 +1507,7 @@ static struct s3c24xx_serial_drv_data s3c2412_serial_drv_data = {
 #endif
 #if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2416) || \
-        defined(CONFIG_CPU_S3C2443)
+        defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2442)
 static struct s3c24xx_serial_drv_data s3c2440_serial_drv_data = {
        .info = &(struct s3c24xx_uart_info) {
                .name           = "Samsung S3C2440 UART",
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 13056180adf5..9c4c05b2825b 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2230,7 +2230,6 @@ int uart_register_driver(struct uart_driver *drv)
        drv->tty_driver = normal;
-        normal->owner           = drv->owner;
        normal->driver_name     = drv->driver_name;
        normal->name            = drv->dev_name;
        normal->major           = drv->major;
diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index 238c7df73ef5..4e1b5515f881 100644
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -461,12 +461,12 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
        struct tty_struct *tty;
        if (!port) {
-                printk(KERN_ERR "sn_receive_chars - port NULL so can't receieve\n");
+                printk(KERN_ERR "sn_receive_chars - port NULL so can't receive\n");
                return;
        }
        if (!port->sc_ops) {
-                printk(KERN_ERR "sn_receive_chars - port->sc_ops  NULL so can't receieve\n");
+                printk(KERN_ERR "sn_receive_chars - port->sc_ops  NULL so can't receive\n");
                return;
        }
diff --git a/drivers/tty/serial/suncore.c b/drivers/tty/serial/suncore.c
index 6381a0282ee7..6e4ac8db2d79 100644
--- a/drivers/tty/serial/suncore.c
+++ b/drivers/tty/serial/suncore.c
@@ -17,11 +17,11 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/serial_core.h>
+#include <linux/sunserialcore.h>
 #include <linux/init.h>
 #include <asm/prom.h>
-#include "suncore.h"
 static int sunserial_current_minor = 64;
diff --git a/drivers/tty/serial/suncore.h b/drivers/tty/serial/suncore.h
deleted file mode 100644
index db2057936c31..000000000000
--- a/drivers/tty/serial/suncore.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* suncore.h
- *
- * Generic SUN serial/kbd/ms layer.  Based entirely
- * upon drivers/sbus/char/sunserial.h which is:
- *
- * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
- *
- * Port to new UART layer is:
- *
- * Copyright (C) 2002 David S. Miller (davem@redhat.com)
- */
-#ifndef _SERIAL_SUN_H
-#define _SERIAL_SUN_H
-/* Serial keyboard defines for L1-A processing... */
-#define SUNKBD_RESET            0xff
-#define SUNKBD_L1               0x01
-#define SUNKBD_UP               0x80
-#define SUNKBD_A                0x4d
-extern unsigned int suncore_mouse_baud_cflag_next(unsigned int, int *);
-extern int suncore_mouse_baud_detection(unsigned char, int);
-extern int sunserial_register_minors(struct uart_driver *, int);
-extern void sunserial_unregister_minors(struct uart_driver *, int);
-extern int sunserial_console_match(struct console *, struct device_node *,
-                                   struct uart_driver *, int, bool);
-extern void sunserial_console_termios(struct console *,
-                                      struct device_node *);
-#endif /* !(_SERIAL_SUN_H) */
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index c0b7246d7339..3ba5d285c2d0 100644
--- a/drivers/tty/serial/sunhv.c
+++ b/drivers/tty/serial/sunhv.c
@@ -29,8 +29,7 @@
 #endif
 #include <linux/serial_core.h>
+#include <linux/sunserialcore.h>
-#include "suncore.h"
 #define CON_BREAK       ((long)-1)
 #define CON_HUP         ((long)-2)
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c
index b5fa2a57b9da..62dacd0ba526 100644
--- a/drivers/tty/serial/sunsab.c
+++ b/drivers/tty/serial/sunsab.c
@@ -43,8 +43,8 @@
 #endif
 #include <linux/serial_core.h>
+#include <linux/sunserialcore.h>
-#include "suncore.h"
 #include "sunsab.h"
 struct uart_sunsab_port {
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index ad0f8f5f6ea1..d3ca6da129fe 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -47,8 +47,7 @@
 #endif
 #include <linux/serial_core.h>
+#include <linux/sunserialcore.h>
-#include "suncore.h"
 /* We are on a NS PC87303 clocked with 24.0 MHz, which results
 * in a UART clock of 1.8462 MHz.
diff --git a/drivers/tty/serial/sunzilog.c b/drivers/tty/serial/sunzilog.c
index 8e916e76b7b5..da4415842a43 100644
--- a/drivers/tty/serial/sunzilog.c
+++ b/drivers/tty/serial/sunzilog.c
@@ -43,8 +43,8 @@
 #endif
 #include <linux/serial_core.h>
+#include <linux/sunserialcore.h>
-#include "suncore.h"
 #include "sunzilog.h"
 /* On 32-bit sparcs we need to delay after register accesses
@@ -1397,7 +1397,7 @@ static void __devinit sunzilog_init_hw(struct uart_sunzilog_port *up)
 #endif
 }
-static int zilog_irq = -1;
+static int zilog_irq;
 static int __devinit zs_probe(struct platform_device *op)
 {
@@ -1425,7 +1425,7 @@ static int __devinit zs_probe(struct platform_device *op)
        rp = sunzilog_chip_regs[inst];
-        if (zilog_irq == -1)
+        if (!zilog_irq)
                zilog_irq = op->archdata.irqs[0];
        up = &sunzilog_port_table[inst * 2];
@@ -1580,7 +1580,7 @@ static int __init sunzilog_init(void)
        if (err)
                goto out_unregister_uart;
-        if (zilog_irq != -1) {
+        if (!zilog_irq) {
                struct uart_sunzilog_port *up = sunzilog_irq_chain;
                err = request_irq(zilog_irq, sunzilog_interrupt, IRQF_SHARED,
                                  "zs", sunzilog_irq_chain);
@@ -1621,7 +1621,7 @@ static void __exit sunzilog_exit(void)
 {
        platform_driver_unregister(&zs_driver);
-        if (zilog_irq != -1) {
+        if (!zilog_irq) {
                struct uart_sunzilog_port *up = sunzilog_irq_chain;
                /* Disable Interrupts */
@@ -1637,7 +1637,7 @@ static void __exit sunzilog_exit(void)
                }
                free_irq(zilog_irq, sunzilog_irq_chain);
-                zilog_irq = -1;
+                zilog_irq = 0;
        }
        if (sunzilog_reg.nr) {
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 2ebe606a2db1..f99b0c965f85 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -1360,7 +1360,7 @@ static int ucc_uart_probe(struct platform_device *ofdev)
        }
        qe_port->port.irq = irq_of_parse_and_map(np, 0);
-        if (qe_port->port.irq == NO_IRQ) {
+        if (qe_port->port.irq == 0) {
                dev_err(&ofdev->dev, "could not map IRQ for UCC%u\n",
                       qe_port->ucc_num + 1);
                ret = -EINVAL;
diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index 83148e79ca13..cf0d9485ec08 100644
--- a/drivers/tty/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
@@ -61,7 +61,7 @@
 static struct uart_port siu_uart_ports[SIU_PORTS_MAX] = {
        [0 ... SIU_PORTS_MAX-1] = {
                .lock   = __SPIN_LOCK_UNLOCKED(siu_uart_ports->lock),
-                .irq    = -1,
+                .irq    = 0,
        },
 };
@@ -171,7 +171,7 @@ static inline unsigned int siu_check_type(struct uart_port *port)
 {
        if (port->line == 0)
                return PORT_VR41XX_SIU;
-        if (port->line == 1 && port->irq != -1)
+        if (port->line == 1 && port->irq)
                return PORT_VR41XX_DSIU;
        return PORT_UNKNOWN;
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 026cb9ea5cd1..2be006fb3da0 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -544,7 +544,7 @@ static struct uart_driver vt8500_uart_driver = {
        .cons           = VT8500_CONSOLE,
 };
-static int __init vt8500_serial_probe(struct platform_device *pdev)
+static int __devinit vt8500_serial_probe(struct platform_device *pdev)
 {
        struct vt8500_port *vt8500_port;
        struct resource *mmres, *irqres;
@@ -605,7 +605,7 @@ static int __devexit vt8500_serial_remove(struct platform_device *pdev)
 static struct platform_driver vt8500_platform_driver = {
        .probe  = vt8500_serial_probe,
-        .remove = vt8500_serial_remove,
+        .remove = __devexit_p(vt8500_serial_remove),
        .driver = {
                .name = "vt8500_serial",
                .owner = THIS_MODULE,
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index ff8017f87914..8e518da85fd5 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -3381,7 +3381,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
        /* verify range of specified line number */     
        line = tty->index;
-        if ((line < 0) || (line >= mgsl_device_count)) {
+        if (line >= mgsl_device_count) {
                printk("%s(%d):mgsl_open with invalid line #%d.\n",
                        __FILE__,__LINE__,line);
                return -ENODEV;
@@ -4333,7 +4333,6 @@ static int mgsl_init_tty(void)
        if (!serial_driver)
                return -ENOMEM;
        
-        serial_driver->owner = THIS_MODULE;
        serial_driver->driver_name = "synclink";
        serial_driver->name = "ttySL";
        serial_driver->major = ttymajor;
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 18b48cd3b41d..6bee4907c6a5 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -654,7 +654,7 @@ static int open(struct tty_struct *tty, struct file *filp)
        unsigned long flags;
        line = tty->index;
-        if ((line < 0) || (line >= slgt_device_count)) {
+        if (line >= slgt_device_count) {
                DBGERR(("%s: open with invalid line #%d.\n", driver_name, line));
                return -ENODEV;
        }
@@ -3795,7 +3795,6 @@ static int __init slgt_init(void)
        /* Initialize the tty_driver structure */
-        serial_driver->owner = THIS_MODULE;
        serial_driver->driver_name = tty_driver_name;
        serial_driver->name = tty_dev_prefix;
        serial_driver->major = ttymajor;
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index a7efe538df00..4fb6c4b31b79 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -721,7 +721,7 @@ static int open(struct tty_struct *tty, struct file *filp)
        unsigned long flags;
        line = tty->index;
-        if ((line < 0) || (line >= synclinkmp_device_count)) {
+        if (line >= synclinkmp_device_count) {
                printk("%s(%d): open with invalid line #%d.\n",
                        __FILE__,__LINE__,line);
                return -ENODEV;
@@ -3977,7 +3977,6 @@ static int __init synclinkmp_init(void)
        /* Initialize the tty_driver structure */
-        serial_driver->owner = THIS_MODULE;
        serial_driver->driver_name = "synclinkmp";
        serial_driver->name = "ttySLM";
        serial_driver->major = ttymajor;
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 7867b7c4538e..ecb8e2203ac8 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -110,11 +110,9 @@ static struct sysrq_key_op sysrq_SAK_op = {
 #ifdef CONFIG_VT
 static void sysrq_handle_unraw(int key)
 {
-        struct kbd_struct *kbd = &kbd_table[fg_console];
+        vt_reset_unicode(fg_console);
-        if (kbd)
-                kbd->kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
 }
 static struct sysrq_key_op sysrq_unraw_op = {
        .handler        = sysrq_handle_unraw,
        .help_msg       = "unRaw",
@@ -322,11 +320,16 @@ static void send_sig_all(int sig)
 {
        struct task_struct *p;
+        read_lock(&tasklist_lock);
        for_each_process(p) {
-                if (p->mm && !is_global_init(p))
+                if (p->flags & PF_KTHREAD)
-                        /* Not swapper, init nor kernel thread */
+                        continue;
-                        force_sig(sig, p);
+                if (is_global_init(p))
+                        continue;
+                force_sig(sig, p);
        }
+        read_unlock(&tasklist_lock);
 }
 static void sysrq_handle_term(int key)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index e41b9bbc107d..dd8a938510ca 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1230,13 +1230,10 @@ static void tty_line_name(struct tty_driver *driver, int index, char *p)
 static struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver,
                struct inode *inode, int idx)
 {
-        struct tty_struct *tty;
        if (driver->ops->lookup)
                return driver->ops->lookup(driver, inode, idx);
-        tty = driver->ttys[idx];
+        return driver->ttys[idx];
-        return tty;
 }
 /**
@@ -1271,6 +1268,19 @@ int tty_init_termios(struct tty_struct *tty)
 }
 EXPORT_SYMBOL_GPL(tty_init_termios);
+int tty_standard_install(struct tty_driver *driver, struct tty_struct *tty)
+{
+        int ret = tty_init_termios(tty);
+        if (ret)
+                return ret;
+        tty_driver_kref_get(driver);
+        tty->count++;
+        driver->ttys[tty->index] = tty;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(tty_standard_install);
 /**
 *      tty_driver_install_tty() - install a tty entry in the driver
 *      @driver: the driver for the tty
@@ -1286,21 +1296,8 @@ EXPORT_SYMBOL_GPL(tty_init_termios);
 static int tty_driver_install_tty(struct tty_driver *driver,
                                                struct tty_struct *tty)
 {
-        int idx = tty->index;
+        return driver->ops->install ? driver->ops->install(driver, tty) :
-        int ret;
+                tty_standard_install(driver, tty);
-        if (driver->ops->install) {
-                ret = driver->ops->install(driver, tty);
-                return ret;
-        }
-        if (tty_init_termios(tty) == 0) {
-                tty_driver_kref_get(driver);
-                tty->count++;
-                driver->ttys[idx] = tty;
-                return 0;
-        }
-        return -ENOMEM;
 }
 /**
@@ -1351,7 +1348,6 @@ static int tty_reopen(struct tty_struct *tty)
                tty->link->count++;
        }
        tty->count++;
-        tty->driver = driver; /* N.B. why do this every time?? */
        mutex_lock(&tty->ldisc_mutex);
        WARN_ON(!test_bit(TTY_LDISC, &tty->flags));
@@ -1365,7 +1361,6 @@ static int tty_reopen(struct tty_struct *tty)
 *      @driver: tty driver we are opening a device on
 *      @idx: device index
 *      @ret_tty: returned tty structure
- *      @first_ok: ok to open a new device (used by ptmx)
 *
 *      Prepare a tty device. This may not be a "new" clean device but
 *      could also be an active device. The pty drivers require special
@@ -1385,18 +1380,11 @@ static int tty_reopen(struct tty_struct *tty)
 * relaxed for the (most common) case of reopening a tty.
 */
-struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx,
+struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)
-                                                                int first_ok)
 {
        struct tty_struct *tty;
        int retval;
-        /* Check if pty master is being opened multiple times */
-        if (driver->subtype == PTY_TYPE_MASTER &&
-                (driver->flags & TTY_DRIVER_DEVPTS_MEM) && !first_ok) {
-                return ERR_PTR(-EIO);
-        }
        /*
         * First time open is complex, especially for PTY devices.
         * This code guarantees that either everything succeeds and the
@@ -1950,7 +1938,7 @@ retry_open:
                if (retval)
                        tty = ERR_PTR(retval);
        } else
-                tty = tty_init_dev(driver, index, 0);
+                tty = tty_init_dev(driver, index);
        mutex_unlock(&tty_mutex);
        if (driver)
@@ -2941,7 +2929,6 @@ void initialize_tty_struct(struct tty_struct *tty,
        tty->session = NULL;
        tty->pgrp = NULL;
        tty->overrun_time = jiffies;
-        tty->buf.head = tty->buf.tail = NULL;
        tty_buffer_init(tty);
        mutex_init(&tty->termios_mutex);
        mutex_init(&tty->ldisc_mutex);
@@ -3058,7 +3045,7 @@ void tty_unregister_device(struct tty_driver *driver, unsigned index)
 }
 EXPORT_SYMBOL(tty_unregister_device);
-struct tty_driver *alloc_tty_driver(int lines)
+struct tty_driver *__alloc_tty_driver(int lines, struct module *owner)
 {
        struct tty_driver *driver;
@@ -3067,11 +3054,12 @@ struct tty_driver *alloc_tty_driver(int lines)
                kref_init(&driver->kref);
                driver->magic = TTY_DRIVER_MAGIC;
                driver->num = lines;
+                driver->owner = owner;
                /* later we'll move allocation of tables here */
        }
        return driver;
 }
-EXPORT_SYMBOL(alloc_tty_driver);
+EXPORT_SYMBOL(__alloc_tty_driver);
 static void destruct_tty_driver(struct kref *kref)
 {
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index a0f3d6c4d39d..8308fc7cdc26 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -516,6 +516,7 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
        int err = 0, err1, i;
        struct uni_pagedir *p, *q;
+        /* Save original vc_unipagdir_loc in case we allocate a new one */
        p = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
        if (p->readonly) return -EIO;
        
@@ -528,26 +529,57 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
                err1 = con_clear_unimap(vc, NULL);
                if (err1) return err1;
                
+                /*
+                 * Since refcount was > 1, con_clear_unimap() allocated a
+                 * a new uni_pagedir for this vc.  Re: p != q
+                 */
                q = (struct uni_pagedir *)*vc->vc_uni_pagedir_loc;
-                for (i = 0, l = 0; i < 32; i++)
+                /*
+                 * uni_pgdir is a 32*32*64 table with rows allocated
+                 * when its first entry is added.  The unicode value must
+                 * still be incremented for empty rows.  We are copying
+                 * entries from "p" (old) to "q" (new).
+                 */
+                l = 0;          /* unicode value */
+                for (i = 0; i < 32; i++)
                if ((p1 = p->uni_pgdir[i]))
                        for (j = 0; j < 32; j++)
-                        if ((p2 = p1[j]))
+                        if ((p2 = p1[j])) {
                                for (k = 0; k < 64; k++, l++)
                                if (p2[k] != 0xffff) {
+                                        /*
+                                         * Found one, copy entry for unicode
+                                         * l with fontpos value p2[k].
+                                         */
                                        err1 = con_insert_unipair(q, l, p2[k]);
                                        if (err1) {
                                                p->refcount++;
                                                *vc->vc_uni_pagedir_loc = (unsigned long)p;
                                                con_release_unimap(q);
                                                kfree(q);
-                                                return err1; 
+                                                return err1;
                                        }
-                                }
+                                }
-                p = q;
+                        } else {
-        } else if (p == dflt)
+                                /* Account for row of 64 empty entries */
+                                l += 64;
+                        }
+                else
+                        /* Account for empty table */
+                        l += 32 * 64;
+                /*
+                 * Finished copying font table, set vc_uni_pagedir to new table
+                 */
+                p = q;
+        } else if (p == dflt) {
                dflt = NULL;
-        
+        }
+        /*
+         * Insert user specified unicode pairs into new table.
+         */
        while (ct--) {
                unsigned short unicode, fontpos;
                __get_user(unicode, &list->unicode);
@@ -557,11 +589,14 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)
                list++;
        }
        
+        /*
+         * Merge with fontmaps of any other virtual consoles.
+         */
        if (con_unify_unimap(vc, p))
                return err;
        for (i = 0; i <= 3; i++)
-                set_inverse_transl(vc, p, i); /* Update all inverse translations */
+                set_inverse_transl(vc, p, i); /* Update inverse translations */
        set_inverse_trans_unicode(vc, p);
  
        return err;
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index a605549ee28f..86dd1e302bb3 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -41,6 +41,7 @@
 #include <linux/reboot.h>
 #include <linux/notifier.h>
 #include <linux/jiffies.h>
+#include <linux/uaccess.h>
 #include <asm/irq_regs.h>
@@ -55,8 +56,8 @@ extern void ctrl_alt_del(void);
 /*
 * Some laptops take the 789uiojklm,. keys as number pad when NumLock is on.
 * This seems a good reason to start with NumLock off. On HIL keyboards
- * of PARISC machines however there is no NumLock key and everyone expects the keypad
+ * of PARISC machines however there is no NumLock key and everyone expects the
- * to be used for numbers.
+ * keypad to be used for numbers.
 */
 #if defined(CONFIG_PARISC) && (defined(CONFIG_KEYBOARD_HIL) || defined(CONFIG_KEYBOARD_HIL_OLD))
@@ -67,8 +68,6 @@ extern void ctrl_alt_del(void);
 #define KBD_DEFLOCK 0
-void compute_shiftstate(void);
 /*
 * Handler Tables.
 */
@@ -99,35 +98,29 @@ static fn_handler_fn *fn_handler[] = { FN_HANDLERS };
 * Variables exported for vt_ioctl.c
 */
-/* maximum values each key_handler can handle */
-const int max_vals[] = {
-        255, ARRAY_SIZE(func_table) - 1, ARRAY_SIZE(fn_handler) - 1, NR_PAD - 1,
-        NR_DEAD - 1, 255, 3, NR_SHIFT - 1, 255, NR_ASCII - 1, NR_LOCK - 1,
-        255, NR_LOCK - 1, 255, NR_BRL - 1
-};
-const int NR_TYPES = ARRAY_SIZE(max_vals);
-struct kbd_struct kbd_table[MAX_NR_CONSOLES];
-EXPORT_SYMBOL_GPL(kbd_table);
-static struct kbd_struct *kbd = kbd_table;
 struct vt_spawn_console vt_spawn_con = {
        .lock = __SPIN_LOCK_UNLOCKED(vt_spawn_con.lock),
        .pid  = NULL,
        .sig  = 0,
 };
-/*
- * Variables exported for vt.c
- */
-int shift_state = 0;
 /*
 * Internal Data.
 */
+static struct kbd_struct kbd_table[MAX_NR_CONSOLES];
+static struct kbd_struct *kbd = kbd_table;
+/* maximum values each key_handler can handle */
+static const int max_vals[] = {
+        255, ARRAY_SIZE(func_table) - 1, ARRAY_SIZE(fn_handler) - 1, NR_PAD - 1,
+        NR_DEAD - 1, 255, 3, NR_SHIFT - 1, 255, NR_ASCII - 1, NR_LOCK - 1,
+        255, NR_LOCK - 1, 255, NR_BRL - 1
+};
+static const int NR_TYPES = ARRAY_SIZE(max_vals);
 static struct input_handler kbd_handler;
 static DEFINE_SPINLOCK(kbd_event_lock);
 static unsigned long key_down[BITS_TO_LONGS(KEY_CNT)];  /* keyboard key bitmap */
@@ -137,6 +130,8 @@ static int npadch = -1;					/* -1 or number assembled on pad */
 static unsigned int diacr;
 static char rep;                                        /* flag telling character repeat */
+static int shift_state = 0;
 static unsigned char ledstate = 0xff;                   /* undefined */
 static unsigned char ledioctl;
@@ -187,7 +182,7 @@ static int getkeycode_helper(struct input_handle *handle, void *data)
        return d->error == 0; /* stop as soon as we successfully get one */
 }
-int getkeycode(unsigned int scancode)
+static int getkeycode(unsigned int scancode)
 {
        struct getset_keycode_data d = {
                .ke     = {
@@ -214,7 +209,7 @@ static int setkeycode_helper(struct input_handle *handle, void *data)
        return d->error == 0; /* stop as soon as we successfully set one */
 }
-int setkeycode(unsigned int scancode, unsigned int keycode)
+static int setkeycode(unsigned int scancode, unsigned int keycode)
 {
        struct getset_keycode_data d = {
                .ke     = {
@@ -382,9 +377,11 @@ static void to_utf8(struct vc_data *vc, uint c)
 /*
 * Called after returning from RAW mode or when changing consoles - recompute
 * shift_down[] and shift_state from key_down[] maybe called when keymap is
- * undefined, so that shiftkey release is seen
+ * undefined, so that shiftkey release is seen. The caller must hold the
+ * kbd_event_lock.
 */
-void compute_shiftstate(void)
+static void do_compute_shiftstate(void)
 {
        unsigned int i, j, k, sym, val;
@@ -417,6 +414,15 @@ void compute_shiftstate(void)
        }
 }
+/* We still have to export this method to vt.c */
+void compute_shiftstate(void)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        do_compute_shiftstate();
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+}
 /*
 * We have a combining character DIACR here, followed by the character CH.
 * If the combination occurs in the table, return the corresponding value.
@@ -636,7 +642,7 @@ static void fn_SAK(struct vc_data *vc)
 static void fn_null(struct vc_data *vc)
 {
-        compute_shiftstate();
+        do_compute_shiftstate();
 }
 /*
@@ -989,6 +995,8 @@ unsigned char getledstate(void)
 void setledstate(struct kbd_struct *kbd, unsigned int led)
 {
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
        if (!(led & ~7)) {
                ledioctl = led;
                kbd->ledmode = LED_SHOW_IOCTL;
@@ -996,6 +1004,7 @@ void setledstate(struct kbd_struct *kbd, unsigned int led)
                kbd->ledmode = LED_SHOW_FLAGS;
        set_leds();
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
 }
 static inline unsigned char getleds(void)
@@ -1035,6 +1044,75 @@ static int kbd_update_leds_helper(struct input_handle *handle, void *data)
        return 0;
 }
+/**
+ *      vt_get_leds     -       helper for braille console
+ *      @console: console to read
+ *      @flag: flag we want to check
+ *
+ *      Check the status of a keyboard led flag and report it back
+ */
+int vt_get_leds(int console, int flag)
+{
+        unsigned long flags;
+        struct kbd_struct * kbd = kbd_table + console;
+        int ret;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        ret = vc_kbd_led(kbd, flag);
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(vt_get_leds);
+/**
+ *      vt_set_led_state        -       set LED state of a console
+ *      @console: console to set
+ *      @leds: LED bits
+ *
+ *      Set the LEDs on a console. This is a wrapper for the VT layer
+ *      so that we can keep kbd knowledge internal
+ */
+void vt_set_led_state(int console, int leds)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        setledstate(kbd, leds);
+}
+/**
+ *      vt_kbd_con_start        -       Keyboard side of console start
+ *      @console: console
+ *
+ *      Handle console start. This is a wrapper for the VT layer
+ *      so that we can keep kbd knowledge internal
+ */
+void vt_kbd_con_start(int console)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        clr_vc_kbd_led(kbd, VC_SCROLLOCK);
+        set_leds();
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+}
+/**
+ *      vt_kbd_con_stop         -       Keyboard side of console stop
+ *      @console: console
+ *
+ *      Handle console stop. This is a wrapper for the VT layer
+ *      so that we can keep kbd knowledge internal
+ */
+void vt_kbd_con_stop(int console)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        set_vc_kbd_led(kbd, VC_SCROLLOCK);
+        set_leds();
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+}
 /*
 * This is the tasklet that updates LED state on all keyboards
 * attached to the box. The reason we use tasklet is that we
@@ -1254,7 +1332,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
        if (rc == NOTIFY_STOP || !key_map) {
                atomic_notifier_call_chain(&keyboard_notifier_list,
                                           KBD_UNBOUND_KEYCODE, &param);
-                compute_shiftstate();
+                do_compute_shiftstate();
                kbd->slockstate = 0;
                return;
        }
@@ -1404,14 +1482,14 @@ static void kbd_start(struct input_handle *handle)
 static const struct input_device_id kbd_ids[] = {
        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT_MASK(EV_KEY) },
+                .evbit = { BIT_MASK(EV_KEY) },
-        },
+        },
        {
-                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
+                .flags = INPUT_DEVICE_ID_MATCH_EVBIT,
-                .evbit = { BIT_MASK(EV_SND) },
+                .evbit = { BIT_MASK(EV_SND) },
-        },
+        },
        { },    /* Terminating entry */
 };
@@ -1433,7 +1511,7 @@ int __init kbd_init(void)
        int i;
        int error;
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
+        for (i = 0; i < MAX_NR_CONSOLES; i++) {
                kbd_table[i].ledflagstate = KBD_DEFLEDS;
                kbd_table[i].default_ledflagstate = KBD_DEFLEDS;
                kbd_table[i].ledmode = LED_SHOW_FLAGS;
@@ -1452,3 +1530,658 @@ int __init kbd_init(void)
        return 0;
 }
+/* Ioctl support code */
+/**
+ *      vt_do_diacrit           -       diacritical table updates
+ *      @cmd: ioctl request
+ *      @up: pointer to user data for ioctl
+ *      @perm: permissions check computed by caller
+ *
+ *      Update the diacritical tables atomically and safely. Lock them
+ *      against simultaneous keypresses
+ */
+int vt_do_diacrit(unsigned int cmd, void __user *up, int perm)
+{
+        struct kbdiacrs __user *a = up;
+        unsigned long flags;
+        int asize;
+        int ret = 0;
+        switch (cmd) {
+        case KDGKBDIACR:
+        {
+                struct kbdiacr *diacr;
+                int i;
+                diacr = kmalloc(MAX_DIACR * sizeof(struct kbdiacr),
+                                                                GFP_KERNEL);
+                if (diacr == NULL)
+                        return -ENOMEM;
+                /* Lock the diacriticals table, make a copy and then
+                   copy it after we unlock */
+                spin_lock_irqsave(&kbd_event_lock, flags);
+                asize = accent_table_size;
+                for (i = 0; i < asize; i++) {
+                        diacr[i].diacr = conv_uni_to_8bit(
+                                                accent_table[i].diacr);
+                        diacr[i].base = conv_uni_to_8bit(
+                                                accent_table[i].base);
+                        diacr[i].result = conv_uni_to_8bit(
+                                                accent_table[i].result);
+                }
+                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                if (put_user(asize, &a->kb_cnt))
+                        ret = -EFAULT;
+                else  if (copy_to_user(a->kbdiacr, diacr,
+                                asize * sizeof(struct kbdiacr)))
+                        ret = -EFAULT;
+                kfree(diacr);
+                return ret;
+        }
+        case KDGKBDIACRUC:
+        {
+                struct kbdiacrsuc __user *a = up;
+                void *buf;
+                buf = kmalloc(MAX_DIACR * sizeof(struct kbdiacruc),
+                                                                GFP_KERNEL);
+                if (buf == NULL)
+                        return -ENOMEM;
+                /* Lock the diacriticals table, make a copy and then
+                   copy it after we unlock */
+                spin_lock_irqsave(&kbd_event_lock, flags);
+                asize = accent_table_size;
+                memcpy(buf, accent_table, asize * sizeof(struct kbdiacruc));
+                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                if (put_user(asize, &a->kb_cnt))
+                        ret = -EFAULT;
+                else if (copy_to_user(a->kbdiacruc, buf,
+                                asize*sizeof(struct kbdiacruc)))
+                        ret = -EFAULT;
+                kfree(buf);
+                return ret;
+        }
+        case KDSKBDIACR:
+        {
+                struct kbdiacrs __user *a = up;
+                struct kbdiacr *diacr = NULL;
+                unsigned int ct;
+                int i;
+                if (!perm)
+                        return -EPERM;
+                if (get_user(ct, &a->kb_cnt))
+                        return -EFAULT;
+                if (ct >= MAX_DIACR)
+                        return -EINVAL;
+                if (ct) {
+                        diacr = kmalloc(sizeof(struct kbdiacr) * ct,
+                                                                GFP_KERNEL);
+                        if (diacr == NULL)
+                                return -ENOMEM;
+                        if (copy_from_user(diacr, a->kbdiacr,
+                                        sizeof(struct kbdiacr) * ct)) {
+                                kfree(diacr);
+                                return -EFAULT;
+                        }
+                }
+                spin_lock_irqsave(&kbd_event_lock, flags);
+                accent_table_size = ct;
+                for (i = 0; i < ct; i++) {
+                        accent_table[i].diacr =
+                                        conv_8bit_to_uni(diacr[i].diacr);
+                        accent_table[i].base =
+                                        conv_8bit_to_uni(diacr[i].base);
+                        accent_table[i].result =
+                                        conv_8bit_to_uni(diacr[i].result);
+                }
+                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                kfree(diacr);
+                return 0;
+        }
+        case KDSKBDIACRUC:
+        {
+                struct kbdiacrsuc __user *a = up;
+                unsigned int ct;
+                void *buf = NULL;
+                if (!perm)
+                        return -EPERM;
+                if (get_user(ct, &a->kb_cnt))
+                        return -EFAULT;
+                if (ct >= MAX_DIACR)
+                        return -EINVAL;
+                if (ct) {
+                        buf = kmalloc(ct * sizeof(struct kbdiacruc),
+                                                                GFP_KERNEL);
+                        if (buf == NULL)
+                                return -ENOMEM;
+                        if (copy_from_user(buf, a->kbdiacruc,
+                                        ct * sizeof(struct kbdiacruc))) {
+                                kfree(buf);
+                                return -EFAULT;
+                        }
+                } 
+                spin_lock_irqsave(&kbd_event_lock, flags);
+                if (ct)
+                        memcpy(accent_table, buf,
+                                        ct * sizeof(struct kbdiacruc));
+                accent_table_size = ct;
+                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                kfree(buf);
+                return 0;
+        }
+        }
+        return ret;
+}
+/**
+ *      vt_do_kdskbmode         -       set keyboard mode ioctl
+ *      @console: the console to use
+ *      @arg: the requested mode
+ *
+ *      Update the keyboard mode bits while holding the correct locks.
+ *      Return 0 for success or an error code.
+ */
+int vt_do_kdskbmode(int console, unsigned int arg)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        int ret = 0;
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        switch(arg) {
+        case K_RAW:
+                kbd->kbdmode = VC_RAW;
+                break;
+        case K_MEDIUMRAW:
+                kbd->kbdmode = VC_MEDIUMRAW;
+                break;
+        case K_XLATE:
+                kbd->kbdmode = VC_XLATE;
+                do_compute_shiftstate();
+                break;
+        case K_UNICODE:
+                kbd->kbdmode = VC_UNICODE;
+                do_compute_shiftstate();
+                break;
+        case K_OFF:
+                kbd->kbdmode = VC_OFF;
+                break;
+        default:
+                ret = -EINVAL;
+        }
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+        return ret;
+}
+/**
+ *      vt_do_kdskbmeta         -       set keyboard meta state
+ *      @console: the console to use
+ *      @arg: the requested meta state
+ *
+ *      Update the keyboard meta bits while holding the correct locks.
+ *      Return 0 for success or an error code.
+ */
+int vt_do_kdskbmeta(int console, unsigned int arg)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        int ret = 0;
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        switch(arg) {
+        case K_METABIT:
+                clr_vc_kbd_mode(kbd, VC_META);
+                break;
+        case K_ESCPREFIX:
+                set_vc_kbd_mode(kbd, VC_META);
+                break;
+        default:
+                ret = -EINVAL;
+        }
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+        return ret;
+}
+int vt_do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc,
+                                                                int perm)
+{
+        struct kbkeycode tmp;
+        int kc = 0;
+        if (copy_from_user(&tmp, user_kbkc, sizeof(struct kbkeycode)))
+                return -EFAULT;
+        switch (cmd) {
+        case KDGETKEYCODE:
+                kc = getkeycode(tmp.scancode);
+                if (kc >= 0)
+                        kc = put_user(kc, &user_kbkc->keycode);
+                break;
+        case KDSETKEYCODE:
+                if (!perm)
+                        return -EPERM;
+                kc = setkeycode(tmp.scancode, tmp.keycode);
+                break;
+        }
+        return kc;
+}
+#define i (tmp.kb_index)
+#define s (tmp.kb_table)
+#define v (tmp.kb_value)
+int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
+                                                int console)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        struct kbentry tmp;
+        ushort *key_map, *new_map, val, ov;
+        unsigned long flags;
+        if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
+                return -EFAULT;
+        if (!capable(CAP_SYS_TTY_CONFIG))
+                perm = 0;
+        switch (cmd) {
+        case KDGKBENT:
+                /* Ensure another thread doesn't free it under us */
+                spin_lock_irqsave(&kbd_event_lock, flags);
+                key_map = key_maps[s];
+                if (key_map) {
+                    val = U(key_map[i]);
+                    if (kbd->kbdmode != VC_UNICODE && KTYP(val) >= NR_TYPES)
+                        val = K_HOLE;
+                } else
+                    val = (i ? K_HOLE : K_NOSUCHMAP);
+                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                return put_user(val, &user_kbe->kb_value);
+        case KDSKBENT:
+                if (!perm)
+                        return -EPERM;
+                if (!i && v == K_NOSUCHMAP) {
+                        spin_lock_irqsave(&kbd_event_lock, flags);
+                        /* deallocate map */
+                        key_map = key_maps[s];
+                        if (s && key_map) {
+                            key_maps[s] = NULL;
+                            if (key_map[0] == U(K_ALLOCATED)) {
+                                        kfree(key_map);
+                                        keymap_count--;
+                            }
+                        }
+                        spin_unlock_irqrestore(&kbd_event_lock, flags);
+                        break;
+                }
+                if (KTYP(v) < NR_TYPES) {
+                    if (KVAL(v) > max_vals[KTYP(v)])
+                                return -EINVAL;
+                } else
+                    if (kbd->kbdmode != VC_UNICODE)
+                                return -EINVAL;
+                /* ++Geert: non-PC keyboards may generate keycode zero */
+#if !defined(__mc68000__) && !defined(__powerpc__)
+                /* assignment to entry 0 only tests validity of args */
+                if (!i)
+                        break;
+#endif
+                new_map = kmalloc(sizeof(plain_map), GFP_KERNEL);
+                if (!new_map)
+                        return -ENOMEM;
+                spin_lock_irqsave(&kbd_event_lock, flags);
+                key_map = key_maps[s];
+                if (key_map == NULL) {
+                        int j;
+                        if (keymap_count >= MAX_NR_OF_USER_KEYMAPS &&
+                            !capable(CAP_SYS_RESOURCE)) {
+                                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                                kfree(new_map);
+                                return -EPERM;
+                        }
+                        key_maps[s] = new_map;
+                        key_map = new_map;
+                        key_map[0] = U(K_ALLOCATED);
+                        for (j = 1; j < NR_KEYS; j++)
+                                key_map[j] = U(K_HOLE);
+                        keymap_count++;
+                } else
+                        kfree(new_map);
+                ov = U(key_map[i]);
+                if (v == ov)
+                        goto out;
+                /*
+                 * Attention Key.
+                 */
+                if (((ov == K_SAK) || (v == K_SAK)) && !capable(CAP_SYS_ADMIN)) {
+                        spin_unlock_irqrestore(&kbd_event_lock, flags);
+                        return -EPERM;
+                }
+                key_map[i] = U(v);
+                if (!s && (KTYP(ov) == KT_SHIFT || KTYP(v) == KT_SHIFT))
+                        do_compute_shiftstate();
+out:
+                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                break;
+        }
+        return 0;
+}
+#undef i
+#undef s
+#undef v
+/* FIXME: This one needs untangling and locking */
+int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+{
+        struct kbsentry *kbs;
+        char *p;
+        u_char *q;
+        u_char __user *up;
+        int sz;
+        int delta;
+        char *first_free, *fj, *fnw;
+        int i, j, k;
+        int ret;
+        if (!capable(CAP_SYS_TTY_CONFIG))
+                perm = 0;
+        kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
+        if (!kbs) {
+                ret = -ENOMEM;
+                goto reterr;
+        }
+        /* we mostly copy too much here (512bytes), but who cares ;) */
+        if (copy_from_user(kbs, user_kdgkb, sizeof(struct kbsentry))) {
+                ret = -EFAULT;
+                goto reterr;
+        }
+        kbs->kb_string[sizeof(kbs->kb_string)-1] = '\0';
+        i = kbs->kb_func;
+        switch (cmd) {
+        case KDGKBSENT:
+                sz = sizeof(kbs->kb_string) - 1; /* sz should have been
+                                                  a struct member */
+                up = user_kdgkb->kb_string;
+                p = func_table[i];
+                if(p)
+                        for ( ; *p && sz; p++, sz--)
+                                if (put_user(*p, up++)) {
+                                        ret = -EFAULT;
+                                        goto reterr;
+                                }
+                if (put_user('\0', up)) {
+                        ret = -EFAULT;
+                        goto reterr;
+                }
+                kfree(kbs);
+                return ((p && *p) ? -EOVERFLOW : 0);
+        case KDSKBSENT:
+                if (!perm) {
+                        ret = -EPERM;
+                        goto reterr;
+                }
+                q = func_table[i];
+                first_free = funcbufptr + (funcbufsize - funcbufleft);
+                for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
+                        ;
+                if (j < MAX_NR_FUNC)
+                        fj = func_table[j];
+                else
+                        fj = first_free;
+                delta = (q ? -strlen(q) : 1) + strlen(kbs->kb_string);
+                if (delta <= funcbufleft) {     /* it fits in current buf */
+                    if (j < MAX_NR_FUNC) {
+                        memmove(fj + delta, fj, first_free - fj);
+                        for (k = j; k < MAX_NR_FUNC; k++)
+                            if (func_table[k])
+                                func_table[k] += delta;
+                    }
+                    if (!q)
+                      func_table[i] = fj;
+                    funcbufleft -= delta;
+                } else {                        /* allocate a larger buffer */
+                    sz = 256;
+                    while (sz < funcbufsize - funcbufleft + delta)
+                      sz <<= 1;
+                    fnw = kmalloc(sz, GFP_KERNEL);
+                    if(!fnw) {
+                      ret = -ENOMEM;
+                      goto reterr;
+                    }
+                    if (!q)
+                      func_table[i] = fj;
+                    if (fj > funcbufptr)
+                        memmove(fnw, funcbufptr, fj - funcbufptr);
+                    for (k = 0; k < j; k++)
+                      if (func_table[k])
+                        func_table[k] = fnw + (func_table[k] - funcbufptr);
+                    if (first_free > fj) {
+                        memmove(fnw + (fj - funcbufptr) + delta, fj, first_free - fj);
+                        for (k = j; k < MAX_NR_FUNC; k++)
+                          if (func_table[k])
+                            func_table[k] = fnw + (func_table[k] - funcbufptr) + delta;
+                    }
+                    if (funcbufptr != func_buf)
+                      kfree(funcbufptr);
+                    funcbufptr = fnw;
+                    funcbufleft = funcbufleft - delta + sz - funcbufsize;
+                    funcbufsize = sz;
+                }
+                strcpy(func_table[i], kbs->kb_string);
+                break;
+        }
+        ret = 0;
+reterr:
+        kfree(kbs);
+        return ret;
+}
+int vt_do_kdskled(int console, int cmd, unsigned long arg, int perm)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        unsigned long flags;
+        unsigned char ucval;
+        switch(cmd) {
+        /* the ioctls below read/set the flags usually shown in the leds */
+        /* don't use them - they will go away without warning */
+        case KDGKBLED:
+                spin_lock_irqsave(&kbd_event_lock, flags);
+                ucval = kbd->ledflagstate | (kbd->default_ledflagstate << 4);
+                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                return put_user(ucval, (char __user *)arg);
+        case KDSKBLED:
+                if (!perm)
+                        return -EPERM;
+                if (arg & ~0x77)
+                        return -EINVAL;
+                spin_lock_irqsave(&kbd_event_lock, flags);
+                kbd->ledflagstate = (arg & 7);
+                kbd->default_ledflagstate = ((arg >> 4) & 7);
+                set_leds();
+                spin_unlock_irqrestore(&kbd_event_lock, flags);
+                break;
+        /* the ioctls below only set the lights, not the functions */
+        /* for those, see KDGKBLED and KDSKBLED above */
+        case KDGETLED:
+                ucval = getledstate();
+                return put_user(ucval, (char __user *)arg);
+        case KDSETLED:
+                if (!perm)
+                        return -EPERM;
+                setledstate(kbd, arg);
+                return 0;
+        }
+        return -ENOIOCTLCMD;
+}
+int vt_do_kdgkbmode(int console)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        /* This is a spot read so needs no locking */
+        switch (kbd->kbdmode) {
+        case VC_RAW:
+                return K_RAW;
+        case VC_MEDIUMRAW:
+                return K_MEDIUMRAW;
+        case VC_UNICODE:
+                return K_UNICODE;
+        case VC_OFF:
+                return K_OFF;
+        default:
+                return K_XLATE;
+        }
+}
+/**
+ *      vt_do_kdgkbmeta         -       report meta status
+ *      @console: console to report
+ *
+ *      Report the meta flag status of this console
+ */
+int vt_do_kdgkbmeta(int console)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        /* Again a spot read so no locking */
+        return vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT;
+}
+/**
+ *      vt_reset_unicode        -       reset the unicode status
+ *      @console: console being reset
+ *
+ *      Restore the unicode console state to its default
+ */
+void vt_reset_unicode(int console)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        kbd_table[console].kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+}
+/**
+ *      vt_get_shiftstate       -       shift bit state
+ *
+ *      Report the shift bits from the keyboard state. We have to export
+ *      this to support some oddities in the vt layer.
+ */
+int vt_get_shift_state(void)
+{
+        /* Don't lock as this is a transient report */
+        return shift_state;
+}
+/**
+ *      vt_reset_keyboard       -       reset keyboard state
+ *      @console: console to reset
+ *
+ *      Reset the keyboard bits for a console as part of a general console
+ *      reset event
+ */
+void vt_reset_keyboard(int console)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        set_vc_kbd_mode(kbd, VC_REPEAT);
+        clr_vc_kbd_mode(kbd, VC_CKMODE);
+        clr_vc_kbd_mode(kbd, VC_APPLIC);
+        clr_vc_kbd_mode(kbd, VC_CRLF);
+        kbd->lockstate = 0;
+        kbd->slockstate = 0;
+        kbd->ledmode = LED_SHOW_FLAGS;
+        kbd->ledflagstate = kbd->default_ledflagstate;
+        /* do not do set_leds here because this causes an endless tasklet loop
+           when the keyboard hasn't been initialized yet */
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+}
+/**
+ *      vt_get_kbd_mode_bit     -       read keyboard status bits
+ *      @console: console to read from
+ *      @bit: mode bit to read
+ *
+ *      Report back a vt mode bit. We do this without locking so the
+ *      caller must be sure that there are no synchronization needs
+ */
+int vt_get_kbd_mode_bit(int console, int bit)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        return vc_kbd_mode(kbd, bit);
+}
+/**
+ *      vt_set_kbd_mode_bit     -       read keyboard status bits
+ *      @console: console to read from
+ *      @bit: mode bit to read
+ *
+ *      Set a vt mode bit. We do this without locking so the
+ *      caller must be sure that there are no synchronization needs
+ */
+void vt_set_kbd_mode_bit(int console, int bit)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        set_vc_kbd_mode(kbd, bit);
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+}
+/**
+ *      vt_clr_kbd_mode_bit     -       read keyboard status bits
+ *      @console: console to read from
+ *      @bit: mode bit to read
+ *
+ *      Report back a vt mode bit. We do this without locking so the
+ *      caller must be sure that there are no synchronization needs
+ */
+void vt_clr_kbd_mode_bit(int console, int bit)
+{
+        struct kbd_struct * kbd = kbd_table + console;
+        unsigned long flags;
+        spin_lock_irqsave(&kbd_event_lock, flags);
+        clr_vc_kbd_mode(kbd, bit);
+        spin_unlock_irqrestore(&kbd_event_lock, flags);
+}
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c
index 7a0a12ae5458..8e9b4be97a2d 100644
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -30,6 +30,7 @@
 extern void poke_blanked_console(void);
+/* FIXME: all this needs locking */
 /* Variables for selection control. */
 /* Use a dynamic buffer, instead of static (Dec 1994) */
 struct vc_data *sel_cons;               /* must not be deallocated */
@@ -61,10 +62,14 @@ sel_pos(int n)
                                use_unicode);
 }
-/* remove the current selection highlight, if any,
+/**
-   from the console holding the selection. */
+ *      clear_selection         -       remove current selection
-void
+ *
-clear_selection(void) {
+ *      Remove the current selection highlight, if any from the console
+ *      holding the selection. The caller must hold the console lock.
+ */
+void clear_selection(void)
+{
        highlight_pointer(-1); /* hide the pointer */
        if (sel_start != -1) {
                highlight(sel_start, sel_end);
@@ -74,7 +79,7 @@ clear_selection(void) {
 /*
 * User settable table: what characters are to be considered alphabetic?
- * 256 bits
+ * 256 bits. Locked by the console lock.
 */
 static u32 inwordLut[8]={
  0x00000000, /* control chars     */
@@ -91,10 +96,20 @@ static inline int inword(const u16 c) {
        return c > 0xff || (( inwordLut[c>>5] >> (c & 0x1F) ) & 1);
 }
-/* set inwordLut contents. Invoked by ioctl(). */
+/**
+ *      set loadlut             -       load the LUT table
+ *      @p: user table
+ *
+ *      Load the LUT table from user space. The caller must hold the console
+ *      lock. Make a temporary copy so a partial update doesn't make a mess.
+ */
 int sel_loadlut(char __user *p)
 {
-        return copy_from_user(inwordLut, (u32 __user *)(p+4), 32) ? -EFAULT : 0;
+        u32 tmplut[8];
+        if (copy_from_user(tmplut, (u32 __user *)(p+4), 32))
+                return -EFAULT;
+        memcpy(inwordLut, tmplut, 32);
+        return 0;
 }
 /* does screen address p correspond to character at LH/RH edge of screen? */
@@ -130,7 +145,16 @@ static int store_utf8(u16 c, char *p)
        }
 }
-/* set the current selection. Invoked by ioctl() or by kernel code. */
+/**
+ *      set_selection           -       set the current selection.
+ *      @sel: user selection info
+ *      @tty: the console tty
+ *
+ *      Invoked by the ioctl handle for the vt layer.
+ *
+ *      The entire selection process is managed under the console_lock. It's
+ *       a lot under the lock but its hardly a performance path
+ */
 int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *tty)
 {
        struct vc_data *vc = vc_cons[fg_console].d;
@@ -138,7 +162,7 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
        char *bp, *obp;
        int i, ps, pe, multiplier;
        u16 c;
-        struct kbd_struct *kbd = kbd_table + fg_console;
+        int mode;
        poke_blanked_console();
@@ -182,7 +206,11 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
                clear_selection();
                sel_cons = vc_cons[fg_console].d;
        }
-        use_unicode = kbd && kbd->kbdmode == VC_UNICODE;
+        mode = vt_do_kdgkbmode(fg_console);
+        if (mode == K_UNICODE)
+                use_unicode = 1;
+        else
+                use_unicode = 0;
        switch (sel_mode)
        {
@@ -302,7 +330,8 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t
 * queue of the tty associated with the current console.
 * Invoked by ioctl().
 *
- * Locking: always called with BTM from vt_ioctl
+ * Locking: called without locks. Calls the ldisc wrongly with
+ * unsafe methods,
 */
 int paste_selection(struct tty_struct *tty)
 {
@@ -317,13 +346,12 @@ int paste_selection(struct tty_struct *tty)
        poke_blanked_console();
        console_unlock();
+        /* FIXME: wtf is this supposed to achieve ? */
        ld = tty_ldisc_ref(tty);
-        if (!ld) {
+        if (!ld)
-                tty_unlock();
                ld = tty_ldisc_ref_wait(tty);
-                tty_lock();
-        }
+        /* FIXME: this is completely unsafe */
        add_wait_queue(&vc->paste_wait, &wait);
        while (sel_buffer && sel_buffer_lth > pasted) {
                set_current_state(TASK_INTERRUPTIBLE);
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index 7a367ff5122b..fa7268a93c06 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -608,10 +608,10 @@ vcs_open(struct inode *inode, struct file *filp)
        unsigned int currcons = iminor(inode) & 127;
        int ret = 0;
        
-        tty_lock();
+        console_lock();
        if(currcons && !vc_cons_allocated(currcons-1))
                ret = -ENXIO;
-        tty_unlock();
+        console_unlock();
        return ret;
 }
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index e716839fab6e..84c4a7d5603e 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1028,9 +1028,9 @@ void vc_deallocate(unsigned int currcons)
 *      VT102 emulator
 */
-#define set_kbd(vc, x)  set_vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
+#define set_kbd(vc, x)  vt_set_kbd_mode_bit((vc)->vc_num, (x))
-#define clr_kbd(vc, x)  clr_vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
+#define clr_kbd(vc, x)  vt_clr_kbd_mode_bit((vc)->vc_num, (x))
-#define is_kbd(vc, x)   vc_kbd_mode(kbd_table + (vc)->vc_num, (x))
+#define is_kbd(vc, x)   vt_get_kbd_mode_bit((vc)->vc_num, (x))
 #define decarm          VC_REPEAT
 #define decckm          VC_CKMODE
@@ -1652,16 +1652,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
        vc->vc_deccm            = global_cursor_default;
        vc->vc_decim            = 0;
-        set_kbd(vc, decarm);
+        vt_reset_keyboard(vc->vc_num);
-        clr_kbd(vc, decckm);
-        clr_kbd(vc, kbdapplic);
-        clr_kbd(vc, lnm);
-        kbd_table[vc->vc_num].lockstate = 0;
-        kbd_table[vc->vc_num].slockstate = 0;
-        kbd_table[vc->vc_num].ledmode = LED_SHOW_FLAGS;
-        kbd_table[vc->vc_num].ledflagstate = kbd_table[vc->vc_num].default_ledflagstate;
-        /* do not do set_leds here because this causes an endless tasklet loop
-           when the keyboard hasn't been initialized yet */
        vc->vc_cursor_type = cur_default;
        vc->vc_complement_mask = vc->vc_s_complement_mask;
@@ -1979,7 +1970,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                case 'q': /* DECLL - but only 3 leds */
                        /* map 0,1,2,3 to 0,1,2,4 */
                        if (vc->vc_par[0] < 4)
-                                setledstate(kbd_table + vc->vc_num,
+                                vt_set_led_state(vc->vc_num,
                                            (vc->vc_par[0] < 3) ? vc->vc_par[0] : 4);
                        return;
                case 'r':
@@ -2632,7 +2623,9 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                        console_unlock();
                        break;
                case TIOCL_SELLOADLUT:
+                        console_lock();
                        ret = sel_loadlut(p);
+                        console_unlock();
                        break;
                case TIOCL_GETSHIFTSTATE:
@@ -2642,15 +2635,19 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
         * kernel-internal variable; programs not closely
         * related to the kernel should not use this.
         */
-                        data = shift_state;
+                        data = vt_get_shift_state();
                        ret = __put_user(data, p);
                        break;
                case TIOCL_GETMOUSEREPORTING:
+                        console_lock(); /* May be overkill */
                        data = mouse_reporting();
+                        console_unlock();
                        ret = __put_user(data, p);
                        break;
                case TIOCL_SETVESABLANK:
+                        console_lock();
                        ret = set_vesa_blanking(p);
+                        console_unlock();
                        break;
                case TIOCL_GETKMSGREDIRECT:
                        data = vt_get_kmsg_redirect();
@@ -2667,13 +2664,21 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                        }
                        break;
                case TIOCL_GETFGCONSOLE:
+                        /* No locking needed as this is a transiently
+                           correct return anyway if the caller hasn't
+                           disabled switching */
                        ret = fg_console;
                        break;
                case TIOCL_SCROLLCONSOLE:
                        if (get_user(lines, (s32 __user *)(p+4))) {
                                ret = -EFAULT;
                        } else {
+                                /* Need the console lock here. Note that lots
+                                   of other calls need fixing before the lock
+                                   is actually useful ! */
+                                console_lock();
                                scrollfront(vc_cons[fg_console].d, lines);
+                                console_unlock();
                                ret = 0;
                        }
                        break;
@@ -2753,8 +2758,7 @@ static void con_stop(struct tty_struct *tty)
        console_num = tty->index;
        if (!vc_cons_allocated(console_num))
                return;
-        set_vc_kbd_led(kbd_table + console_num, VC_SCROLLOCK);
+        vt_kbd_con_stop(console_num);
-        set_leds();
 }
 /*
@@ -2768,8 +2772,7 @@ static void con_start(struct tty_struct *tty)
        console_num = tty->index;
        if (!vc_cons_allocated(console_num))
                return;
-        clr_vc_kbd_led(kbd_table + console_num, VC_SCROLLOCK);
+        vt_kbd_con_start(console_num);
-        set_leds();
 }
 static void con_flush_chars(struct tty_struct *tty)
@@ -2991,7 +2994,7 @@ int __init vty_init(const struct file_operations *console_fops)
        console_driver = alloc_tty_driver(MAX_NR_CONSOLES);
        if (!console_driver)
                panic("Couldn't allocate console driver\n");
-        console_driver->owner = THIS_MODULE;
        console_driver->name = "tty";
        console_driver->name_base = 1;
        console_driver->major = TTY_MAJOR;
@@ -3980,9 +3983,6 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
        int rc = -EINVAL;
        int c;
-        if (vc->vc_mode != KD_TEXT)
-                return -EINVAL;
        if (op->data) {
                font.data = kmalloc(max_font_size, GFP_KERNEL);
                if (!font.data)
@@ -3991,7 +3991,9 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
                font.data = NULL;
        console_lock();
-        if (vc->vc_sw->con_font_get)
+        if (vc->vc_mode != KD_TEXT)
+                rc = -EINVAL;
+        else if (vc->vc_sw->con_font_get)
                rc = vc->vc_sw->con_font_get(vc, &font);
        else
                rc = -ENOSYS;
@@ -4073,7 +4075,9 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op)
        if (IS_ERR(font.data))
                return PTR_ERR(font.data);
        console_lock();
-        if (vc->vc_sw->con_font_set)
+        if (vc->vc_mode != KD_TEXT)
+                rc = -EINVAL;
+        else if (vc->vc_sw->con_font_set)
                rc = vc->vc_sw->con_font_set(vc, &font, op->flags);
        else
                rc = -ENOSYS;
@@ -4089,8 +4093,6 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op)
        char *s = name;
        int rc;
-        if (vc->vc_mode != KD_TEXT)
-                return -EINVAL;
        if (!op->data)
                s = NULL;
@@ -4100,6 +4102,10 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op)
                name[MAX_FONT_NAME - 1] = 0;
        console_lock();
+        if (vc->vc_mode != KD_TEXT) {
+                console_unlock();
+                return -EINVAL;
+        }
        if (vc->vc_sw->con_font_default)
                rc = vc->vc_sw->con_font_default(vc, &font, s);
        else
@@ -4117,11 +4123,11 @@ static int con_font_copy(struct vc_data *vc, struct console_font_op *op)
        int con = op->height;
        int rc;
-        if (vc->vc_mode != KD_TEXT)
-                return -EINVAL;
        console_lock();
-        if (!vc->vc_sw->con_font_copy)
+        if (vc->vc_mode != KD_TEXT)
+                rc = -EINVAL;
+        else if (!vc->vc_sw->con_font_copy)
                rc = -ENOSYS;
        else if (con < 0 || !vc_cons_allocated(con))
                rc = -ENOTTY;
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 65447c5f91d7..ede2ef18d2fb 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -130,7 +130,7 @@ static void vt_event_wait(struct vt_event_wait *vw)
        list_add(&vw->list, &vt_events);
        spin_unlock_irqrestore(&vt_event_lock, flags);
        /* Wait for it to pass */
-        wait_event_interruptible_tty(vt_event_waitqueue, vw->done);
+        wait_event_interruptible(vt_event_waitqueue, vw->done);
        /* Dequeue it */
        spin_lock_irqsave(&vt_event_lock, flags);
        list_del(&vw->list);
@@ -195,232 +195,7 @@ int vt_waitactive(int n)
 #define GPLAST 0x3df
 #define GPNUM (GPLAST - GPFIRST + 1)
-#define i (tmp.kb_index)
-#define s (tmp.kb_table)
-#define v (tmp.kb_value)
-static inline int
-do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_struct *kbd)
-{
-        struct kbentry tmp;
-        ushort *key_map, val, ov;
-        if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
-                return -EFAULT;
-        if (!capable(CAP_SYS_TTY_CONFIG))
-                perm = 0;
-        switch (cmd) {
-        case KDGKBENT:
-                key_map = key_maps[s];
-                if (key_map) {
-                    val = U(key_map[i]);
-                    if (kbd->kbdmode != VC_UNICODE && KTYP(val) >= NR_TYPES)
-                        val = K_HOLE;
-                } else
-                    val = (i ? K_HOLE : K_NOSUCHMAP);
-                return put_user(val, &user_kbe->kb_value);
-        case KDSKBENT:
-                if (!perm)
-                        return -EPERM;
-                if (!i && v == K_NOSUCHMAP) {
-                        /* deallocate map */
-                        key_map = key_maps[s];
-                        if (s && key_map) {
-                            key_maps[s] = NULL;
-                            if (key_map[0] == U(K_ALLOCATED)) {
-                                        kfree(key_map);
-                                        keymap_count--;
-                            }
-                        }
-                        break;
-                }
-                if (KTYP(v) < NR_TYPES) {
-                    if (KVAL(v) > max_vals[KTYP(v)])
-                                return -EINVAL;
-                } else
-                    if (kbd->kbdmode != VC_UNICODE)
-                                return -EINVAL;
-                /* ++Geert: non-PC keyboards may generate keycode zero */
-#if !defined(__mc68000__) && !defined(__powerpc__)
-                /* assignment to entry 0 only tests validity of args */
-                if (!i)
-                        break;
-#endif
-                if (!(key_map = key_maps[s])) {
-                        int j;
-                        if (keymap_count >= MAX_NR_OF_USER_KEYMAPS &&
-                            !capable(CAP_SYS_RESOURCE))
-                                return -EPERM;
-                        key_map = kmalloc(sizeof(plain_map),
-                                                     GFP_KERNEL);
-                        if (!key_map)
-                                return -ENOMEM;
-                        key_maps[s] = key_map;
-                        key_map[0] = U(K_ALLOCATED);
-                        for (j = 1; j < NR_KEYS; j++)
-                                key_map[j] = U(K_HOLE);
-                        keymap_count++;
-                }
-                ov = U(key_map[i]);
-                if (v == ov)
-                        break;  /* nothing to do */
-                /*
-                 * Attention Key.
-                 */
-                if (((ov == K_SAK) || (v == K_SAK)) && !capable(CAP_SYS_ADMIN))
-                        return -EPERM;
-                key_map[i] = U(v);
-                if (!s && (KTYP(ov) == KT_SHIFT || KTYP(v) == KT_SHIFT))
-                        compute_shiftstate();
-                break;
-        }
-        return 0;
-}
-#undef i
-#undef s
-#undef v
-static inline int 
-do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc, int perm)
-{
-        struct kbkeycode tmp;
-        int kc = 0;
-        if (copy_from_user(&tmp, user_kbkc, sizeof(struct kbkeycode)))
-                return -EFAULT;
-        switch (cmd) {
-        case KDGETKEYCODE:
-                kc = getkeycode(tmp.scancode);
-                if (kc >= 0)
-                        kc = put_user(kc, &user_kbkc->keycode);
-                break;
-        case KDSETKEYCODE:
-                if (!perm)
-                        return -EPERM;
-                kc = setkeycode(tmp.scancode, tmp.keycode);
-                break;
-        }
-        return kc;
-}
-static inline int
-do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
-{
-        struct kbsentry *kbs;
-        char *p;
-        u_char *q;
-        u_char __user *up;
-        int sz;
-        int delta;
-        char *first_free, *fj, *fnw;
-        int i, j, k;
-        int ret;
-        if (!capable(CAP_SYS_TTY_CONFIG))
-                perm = 0;
-        kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
-        if (!kbs) {
-                ret = -ENOMEM;
-                goto reterr;
-        }
-        /* we mostly copy too much here (512bytes), but who cares ;) */
-        if (copy_from_user(kbs, user_kdgkb, sizeof(struct kbsentry))) {
-                ret = -EFAULT;
-                goto reterr;
-        }
-        kbs->kb_string[sizeof(kbs->kb_string)-1] = '\0';
-        i = kbs->kb_func;
-        switch (cmd) {
-        case KDGKBSENT:
-                sz = sizeof(kbs->kb_string) - 1; /* sz should have been
-                                                  a struct member */
-                up = user_kdgkb->kb_string;
-                p = func_table[i];
-                if(p)
-                        for ( ; *p && sz; p++, sz--)
-                                if (put_user(*p, up++)) {
-                                        ret = -EFAULT;
-                                        goto reterr;
-                                }
-                if (put_user('\0', up)) {
-                        ret = -EFAULT;
-                        goto reterr;
-                }
-                kfree(kbs);
-                return ((p && *p) ? -EOVERFLOW : 0);
-        case KDSKBSENT:
-                if (!perm) {
-                        ret = -EPERM;
-                        goto reterr;
-                }
-                q = func_table[i];
-                first_free = funcbufptr + (funcbufsize - funcbufleft);
-                for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 
-                        ;
-                if (j < MAX_NR_FUNC)
-                        fj = func_table[j];
-                else
-                        fj = first_free;
-                delta = (q ? -strlen(q) : 1) + strlen(kbs->kb_string);
-                if (delta <= funcbufleft) {     /* it fits in current buf */
-                    if (j < MAX_NR_FUNC) {
-                        memmove(fj + delta, fj, first_free - fj);
-                        for (k = j; k < MAX_NR_FUNC; k++)
-                            if (func_table[k])
-                                func_table[k] += delta;
-                    }
-                    if (!q)
-                      func_table[i] = fj;
-                    funcbufleft -= delta;
-                } else {                        /* allocate a larger buffer */
-                    sz = 256;
-                    while (sz < funcbufsize - funcbufleft + delta)
-                      sz <<= 1;
-                    fnw = kmalloc(sz, GFP_KERNEL);
-                    if(!fnw) {
-                      ret = -ENOMEM;
-                      goto reterr;
-                    }
-                    if (!q)
-                      func_table[i] = fj;
-                    if (fj > funcbufptr)
-                        memmove(fnw, funcbufptr, fj - funcbufptr);
-                    for (k = 0; k < j; k++)
-                      if (func_table[k])
-                        func_table[k] = fnw + (func_table[k] - funcbufptr);
-                    if (first_free > fj) {
-                        memmove(fnw + (fj - funcbufptr) + delta, fj, first_free - fj);
-                        for (k = j; k < MAX_NR_FUNC; k++)
-                          if (func_table[k])
-                            func_table[k] = fnw + (func_table[k] - funcbufptr) + delta;
-                    }
-                    if (funcbufptr != func_buf)
-                      kfree(funcbufptr);
-                    funcbufptr = fnw;
-                    funcbufleft = funcbufleft - delta + sz - funcbufsize;
-                    funcbufsize = sz;
-                }
-                strcpy(func_table[i], kbs->kb_string);
-                break;
-        }
-        ret = 0;
-reterr:
-        kfree(kbs);
-        return ret;
-}
 static inline int 
 do_fontx_ioctl(int cmd, struct consolefontdesc __user *user_cfd, int perm, struct console_font_op *op)
@@ -497,7 +272,6 @@ int vt_ioctl(struct tty_struct *tty,
 {
        struct vc_data *vc = tty->driver_data;
        struct console_font_op op;      /* used in multiple places here */
-        struct kbd_struct * kbd;
        unsigned int console;
        unsigned char ucval;
        unsigned int uival;
@@ -507,7 +281,6 @@ int vt_ioctl(struct tty_struct *tty,
        console = vc->vc_num;
-        tty_lock();
        if (!vc_cons_allocated(console)) {      /* impossible? */
                ret = -ENOIOCTLCMD;
@@ -523,19 +296,18 @@ int vt_ioctl(struct tty_struct *tty,
        if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
                perm = 1;
 
-        kbd = kbd_table + console;
        switch (cmd) {
        case TIOCLINUX:
                ret = tioclinux(tty, arg);
                break;
        case KIOCSOUND:
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                /*
                 * The use of PIT_TICK_RATE is historic, it used to be
                 * the platform-dependent CLOCK_TICK_RATE between 2.6.12
                 * and 2.6.36, which was a minor but unfortunate ABI
-                 * change.
+                 * change. kd_mksound is locked by the input layer.
                 */
                if (arg)
                        arg = PIT_TICK_RATE / arg;
@@ -544,7 +316,7 @@ int vt_ioctl(struct tty_struct *tty,
        case KDMKTONE:
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
        {
                unsigned int ticks, count;
                
@@ -562,10 +334,11 @@ int vt_ioctl(struct tty_struct *tty,
        case KDGKBTYPE:
                /*
-                 * this is naive.
+                 * this is naïve.
                 */
                ucval = KB_101;
-                goto setchar;
+                ret = put_user(ucval, (char __user *)arg);
+                break;
                /*
                 * These cannot be implemented on any machine that implements
@@ -579,6 +352,8 @@ int vt_ioctl(struct tty_struct *tty,
                /*
                 * KDADDIO and KDDELIO may be able to add ports beyond what
                 * we reject here, but to be safe...
+                 *
+                 * These are locked internally via sys_ioperm
                 */
                if (arg < GPFIRST || arg > GPLAST) {
                        ret = -EINVAL;
@@ -601,7 +376,7 @@ int vt_ioctl(struct tty_struct *tty,
                struct kbd_repeat kbrep;
                
                if (!capable(CAP_SYS_TTY_CONFIG))
-                        goto eperm;
+                        return -EPERM;
                if (copy_from_user(&kbrep, up, sizeof(struct kbd_repeat))) {
                        ret =  -EFAULT;
@@ -625,7 +400,7 @@ int vt_ioctl(struct tty_struct *tty,
                 * need to restore their engine state. --BenH
                 */
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                switch (arg) {
                case KD_GRAPHICS:
                        break;
@@ -638,6 +413,7 @@ int vt_ioctl(struct tty_struct *tty,
                        ret = -EINVAL;
                        goto out;
                }
+                /* FIXME: this needs the console lock extending */
                if (vc->vc_mode == (unsigned char) arg)
                        break;
                vc->vc_mode = (unsigned char) arg;
@@ -669,69 +445,26 @@ int vt_ioctl(struct tty_struct *tty,
        case KDSKBMODE:
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
-                switch(arg) {
+                ret = vt_do_kdskbmode(console, arg);
-                  case K_RAW:
+                if (ret == 0)
-                        kbd->kbdmode = VC_RAW;
+                        tty_ldisc_flush(tty);
-                        break;
-                  case K_MEDIUMRAW:
-                        kbd->kbdmode = VC_MEDIUMRAW;
-                        break;
-                  case K_XLATE:
-                        kbd->kbdmode = VC_XLATE;
-                        compute_shiftstate();
-                        break;
-                  case K_UNICODE:
-                        kbd->kbdmode = VC_UNICODE;
-                        compute_shiftstate();
-                        break;
-                  case K_OFF:
-                        kbd->kbdmode = VC_OFF;
-                        break;
-                  default:
-                        ret = -EINVAL;
-                        goto out;
-                }
-                tty_ldisc_flush(tty);
                break;
        case KDGKBMODE:
-                switch (kbd->kbdmode) {
+                uival = vt_do_kdgkbmode(console);
-                case VC_RAW:
+                ret = put_user(uival, (int __user *)arg);
-                        uival = K_RAW;
+                break;
-                        break;
-                case VC_MEDIUMRAW:
-                        uival = K_MEDIUMRAW;
-                        break;
-                case VC_UNICODE:
-                        uival = K_UNICODE;
-                        break;
-                case VC_OFF:
-                        uival = K_OFF;
-                        break;
-                default:
-                        uival = K_XLATE;
-                        break;
-                }
-                goto setint;
        /* this could be folded into KDSKBMODE, but for compatibility
           reasons it is not so easy to fold KDGKBMETA into KDGKBMODE */
        case KDSKBMETA:
-                switch(arg) {
+                ret = vt_do_kdskbmeta(console, arg);
-                  case K_METABIT:
-                        clr_vc_kbd_mode(kbd, VC_META);
-                        break;
-                  case K_ESCPREFIX:
-                        set_vc_kbd_mode(kbd, VC_META);
-                        break;
-                  default:
-                        ret = -EINVAL;
-                }
                break;
        case KDGKBMETA:
-                uival = (vc_kbd_mode(kbd, VC_META) ? K_ESCPREFIX : K_METABIT);
+                /* FIXME: should review whether this is worth locking */
+                uival = vt_do_kdgkbmeta(console);
        setint:
                ret = put_user(uival, (int __user *)arg);
                break;
@@ -740,133 +473,35 @@ int vt_ioctl(struct tty_struct *tty,
        case KDSETKEYCODE:
                if(!capable(CAP_SYS_TTY_CONFIG))
                        perm = 0;
-                ret = do_kbkeycode_ioctl(cmd, up, perm);
+                ret = vt_do_kbkeycode_ioctl(cmd, up, perm);
                break;
        case KDGKBENT:
        case KDSKBENT:
-                ret = do_kdsk_ioctl(cmd, up, perm, kbd);
+                ret = vt_do_kdsk_ioctl(cmd, up, perm, console);
                break;
        case KDGKBSENT:
        case KDSKBSENT:
-                ret = do_kdgkb_ioctl(cmd, up, perm);
+                ret = vt_do_kdgkb_ioctl(cmd, up, perm);
                break;
+        /* Diacritical processing. Handled in keyboard.c as it has
+           to operate on the keyboard locks and structures */
        case KDGKBDIACR:
-        {
-                struct kbdiacrs __user *a = up;
-                struct kbdiacr diacr;
-                int i;
-                if (put_user(accent_table_size, &a->kb_cnt)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                for (i = 0; i < accent_table_size; i++) {
-                        diacr.diacr = conv_uni_to_8bit(accent_table[i].diacr);
-                        diacr.base = conv_uni_to_8bit(accent_table[i].base);
-                        diacr.result = conv_uni_to_8bit(accent_table[i].result);
-                        if (copy_to_user(a->kbdiacr + i, &diacr, sizeof(struct kbdiacr))) {
-                                ret = -EFAULT;
-                                break;
-                        }
-                }
-                break;
-        }
        case KDGKBDIACRUC:
-        {
-                struct kbdiacrsuc __user *a = up;
-                if (put_user(accent_table_size, &a->kb_cnt))
-                        ret = -EFAULT;
-                else if (copy_to_user(a->kbdiacruc, accent_table,
-                                accent_table_size*sizeof(struct kbdiacruc)))
-                        ret = -EFAULT;
-                break;
-        }
        case KDSKBDIACR:
-        {
-                struct kbdiacrs __user *a = up;
-                struct kbdiacr diacr;
-                unsigned int ct;
-                int i;
-                if (!perm)
-                        goto eperm;
-                if (get_user(ct,&a->kb_cnt)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (ct >= MAX_DIACR) {
-                        ret = -EINVAL;
-                        break;
-                }
-                accent_table_size = ct;
-                for (i = 0; i < ct; i++) {
-                        if (copy_from_user(&diacr, a->kbdiacr + i, sizeof(struct kbdiacr))) {
-                                ret = -EFAULT;
-                                break;
-                        }
-                        accent_table[i].diacr = conv_8bit_to_uni(diacr.diacr);
-                        accent_table[i].base = conv_8bit_to_uni(diacr.base);
-                        accent_table[i].result = conv_8bit_to_uni(diacr.result);
-                }
-                break;
-        }
        case KDSKBDIACRUC:
-        {
+                ret = vt_do_diacrit(cmd, up, perm);
-                struct kbdiacrsuc __user *a = up;
-                unsigned int ct;
-                if (!perm)
-                        goto eperm;
-                if (get_user(ct,&a->kb_cnt)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                if (ct >= MAX_DIACR) {
-                        ret = -EINVAL;
-                        break;
-                }
-                accent_table_size = ct;
-                if (copy_from_user(accent_table, a->kbdiacruc, ct*sizeof(struct kbdiacruc)))
-                        ret = -EFAULT;
                break;
-        }
        /* the ioctls below read/set the flags usually shown in the leds */
        /* don't use them - they will go away without warning */
        case KDGKBLED:
-                ucval = kbd->ledflagstate | (kbd->default_ledflagstate << 4);
-                goto setchar;
        case KDSKBLED:
-                if (!perm)
-                        goto eperm;
-                if (arg & ~0x77) {
-                        ret = -EINVAL;
-                        break;
-                }
-                kbd->ledflagstate = (arg & 7);
-                kbd->default_ledflagstate = ((arg >> 4) & 7);
-                set_leds();
-                break;
-        /* the ioctls below only set the lights, not the functions */
-        /* for those, see KDGKBLED and KDSKBLED above */
        case KDGETLED:
-                ucval = getledstate();
-        setchar:
-                ret = put_user(ucval, (char __user *)arg);
-                break;
        case KDSETLED:
-                if (!perm)
+                ret = vt_do_kdskled(console, cmd, arg, perm);
-                        goto eperm;
-                setledstate(kbd, arg);
                break;
        /*
@@ -879,7 +514,7 @@ int vt_ioctl(struct tty_struct *tty,
        case KDSIGACCEPT:
        {
                if (!perm || !capable(CAP_KILL))
-                        goto eperm;
+                        return -EPERM;
                if (!valid_signal(arg) || arg < 1 || arg == SIGKILL)
                        ret = -EINVAL;
                else {
@@ -897,7 +532,7 @@ int vt_ioctl(struct tty_struct *tty,
                struct vt_mode tmp;
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                if (copy_from_user(&tmp, up, sizeof(struct vt_mode))) {
                        ret = -EFAULT;
                        goto out;
@@ -943,6 +578,7 @@ int vt_ioctl(struct tty_struct *tty,
                struct vt_stat __user *vtstat = up;
                unsigned short state, mask;
+                /* Review: FIXME: Console lock ? */
                if (put_user(fg_console + 1, &vtstat->v_active))
                        ret = -EFAULT;
                else {
@@ -960,6 +596,7 @@ int vt_ioctl(struct tty_struct *tty,
         * Returns the first available (non-opened) console.
         */
        case VT_OPENQRY:
+                /* FIXME: locking ? - but then this is a stupid API */
                for (i = 0; i < MAX_NR_CONSOLES; ++i)
                        if (! VT_IS_IN_USE(i))
                                break;
@@ -973,7 +610,7 @@ int vt_ioctl(struct tty_struct *tty,
         */
        case VT_ACTIVATE:
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                if (arg == 0 || arg > MAX_NR_CONSOLES)
                        ret =  -ENXIO;
                else {
@@ -992,7 +629,7 @@ int vt_ioctl(struct tty_struct *tty,
                struct vt_setactivate vsa;
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                if (copy_from_user(&vsa, (struct vt_setactivate __user *)arg,
                                        sizeof(struct vt_setactivate))) {
@@ -1020,6 +657,7 @@ int vt_ioctl(struct tty_struct *tty,
                        if (ret)
                                break;
                        /* Commence switch and lock */
+                        /* Review set_console locks */
                        set_console(vsa.console);
                }
                break;
@@ -1030,7 +668,7 @@ int vt_ioctl(struct tty_struct *tty,
         */
        case VT_WAITACTIVE:
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                if (arg == 0 || arg > MAX_NR_CONSOLES)
                        ret = -ENXIO;
                else
@@ -1049,16 +687,17 @@ int vt_ioctl(struct tty_struct *tty,
         */
        case VT_RELDISP:
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
+                console_lock();
                if (vc->vt_mode.mode != VT_PROCESS) {
+                        console_unlock();
                        ret = -EINVAL;
                        break;
                }
                /*
                 * Switching-from response
                 */
-                console_lock();
                if (vc->vt_newvt >= 0) {
                        if (arg == 0)
                                /*
@@ -1135,7 +774,7 @@ int vt_ioctl(struct tty_struct *tty,
                ushort ll,cc;
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                if (get_user(ll, &vtsizes->v_rows) ||
                    get_user(cc, &vtsizes->v_cols))
                        ret = -EFAULT;
@@ -1146,6 +785,7 @@ int vt_ioctl(struct tty_struct *tty,
                                if (vc) {
                                        vc->vc_resize_user = 1;
+                                        /* FIXME: review v tty lock */
                                        vc_resize(vc_cons[i].d, cc, ll);
                                }
                        }
@@ -1159,7 +799,7 @@ int vt_ioctl(struct tty_struct *tty,
                struct vt_consize __user *vtconsize = up;
                ushort ll,cc,vlin,clin,vcol,ccol;
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                if (!access_ok(VERIFY_READ, vtconsize,
                                sizeof(struct vt_consize))) {
                        ret = -EFAULT;
@@ -1215,7 +855,7 @@ int vt_ioctl(struct tty_struct *tty,
        case PIO_FONT: {
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                op.op = KD_FONT_OP_SET;
                op.flags = KD_FONT_FLAG_OLD | KD_FONT_FLAG_DONT_RECALC; /* Compatibility */
                op.width = 8;
@@ -1256,7 +896,7 @@ int vt_ioctl(struct tty_struct *tty,
        case PIO_FONTRESET:
        {
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
 #ifdef BROKEN_GRAPHICS_PROGRAMS
                /* With BROKEN_GRAPHICS_PROGRAMS defined, the default
@@ -1282,7 +922,7 @@ int vt_ioctl(struct tty_struct *tty,
                        break;
                }
                if (!perm && op.op != KD_FONT_OP_GET)
-                        goto eperm;
+                        return -EPERM;
                ret = con_font_op(vc, &op);
                if (ret)
                        break;
@@ -1294,50 +934,65 @@ int vt_ioctl(struct tty_struct *tty,
        case PIO_SCRNMAP:
                if (!perm)
                        ret = -EPERM;
-                else
+                else {
+                        tty_lock();
                        ret = con_set_trans_old(up);
+                        tty_unlock();
+                }
                break;
        case GIO_SCRNMAP:
+                tty_lock();
                ret = con_get_trans_old(up);
+                tty_unlock();
                break;
        case PIO_UNISCRNMAP:
                if (!perm)
                        ret = -EPERM;
-                else
+                else {
+                        tty_lock();
                        ret = con_set_trans_new(up);
+                        tty_unlock();
+                }
                break;
        case GIO_UNISCRNMAP:
+                tty_lock();
                ret = con_get_trans_new(up);
+                tty_unlock();
                break;
        case PIO_UNIMAPCLR:
              { struct unimapinit ui;
                if (!perm)
-                        goto eperm;
+                        return -EPERM;
                ret = copy_from_user(&ui, up, sizeof(struct unimapinit));
                if (ret)
                        ret = -EFAULT;
-                else
+                else {
+                        tty_lock();
                        con_clear_unimap(vc, &ui);
+                        tty_unlock();
+                }
                break;
              }
        case PIO_UNIMAP:
        case GIO_UNIMAP:
+                tty_lock();
                ret = do_unimap_ioctl(cmd, up, perm, vc);
+                tty_unlock();
                break;
        case VT_LOCKSWITCH:
                if (!capable(CAP_SYS_TTY_CONFIG))
-                        goto eperm;
+                        return -EPERM;
                vt_dont_switch = 1;
                break;
        case VT_UNLOCKSWITCH:
                if (!capable(CAP_SYS_TTY_CONFIG))
-                        goto eperm;
+                        return -EPERM;
                vt_dont_switch = 0;
                break;
        case VT_GETHIFONTMASK:
@@ -1351,17 +1006,13 @@ int vt_ioctl(struct tty_struct *tty,
                ret = -ENOIOCTLCMD;
        }
 out:
-        tty_unlock();
        return ret;
-eperm:
-        ret = -EPERM;
-        goto out;
 }
 void reset_vc(struct vc_data *vc)
 {
        vc->vc_mode = KD_TEXT;
-        kbd_table[vc->vc_num].kbdmode = default_utf8 ? VC_UNICODE : VC_XLATE;
+        vt_reset_unicode(vc->vc_num);
        vc->vt_mode.mode = VT_AUTO;
        vc->vt_mode.waitv = 0;
        vc->vt_mode.relsig = 0;
@@ -1384,6 +1035,7 @@ void vc_SAK(struct work_struct *work)
        console_lock();
        vc = vc_con->d;
        if (vc) {
+                /* FIXME: review tty ref counting */
                tty = vc->port.tty;
                /*
                 * SAK should also work in all raw modes and reset
@@ -1516,8 +1168,6 @@ long vt_compat_ioctl(struct tty_struct *tty,
        console = vc->vc_num;
-        tty_lock();
        if (!vc_cons_allocated(console)) {      /* impossible? */
                ret = -ENOIOCTLCMD;
                goto out;
@@ -1546,7 +1196,9 @@ long vt_compat_ioctl(struct tty_struct *tty,
        case PIO_UNIMAP:
        case GIO_UNIMAP:
+                tty_lock();
                ret = compat_unimap_ioctl(cmd, up, perm, vc);
+                tty_unlock();
                break;
        /*
@@ -1583,11 +1235,9 @@ long vt_compat_ioctl(struct tty_struct *tty,
                goto fallback;
        }
 out:
-        tty_unlock();
        return ret;
 fallback:
-        tty_unlock();
        return vt_ioctl(tty, cmd, arg);
 }
@@ -1773,13 +1423,10 @@ int vt_move_to_console(unsigned int vt, int alloc)
                return -EIO;
        }
        console_unlock();
-        tty_lock();
        if (vt_waitactive(vt + 1)) {
                pr_debug("Suspend: Can't switch VCs.");
-                tty_unlock();
                return -EINTR;
        }
-        tty_unlock();
        return prev;
 }
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 9543b19d410c..6bb8472155c6 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -508,17 +508,12 @@ static int acm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
        if (!acm)
                return -ENODEV;
-        retval = tty_init_termios(tty);
+        retval = tty_standard_install(driver, tty);
        if (retval)
                goto error_init_termios;
        tty->driver_data = acm;
-        /* Final install (we use the default method) */
-        tty_driver_kref_get(driver);
-        tty->count++;
-        driver->ttys[tty->index] = tty;
        return 0;
 error_init_termios:
@@ -1675,7 +1670,6 @@ static int __init acm_init(void)
        acm_tty_driver = alloc_tty_driver(ACM_TTY_MINORS);
        if (!acm_tty_driver)
                return -ENOMEM;
-        acm_tty_driver->owner = THIS_MODULE,
        acm_tty_driver->driver_name = "acm",
        acm_tty_driver->name = "ttyACM",
        acm_tty_driver->major = ACM_TTY_MAJOR,
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index 6597a6813e43..6c23938d2711 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -725,9 +725,6 @@ static int gs_open(struct tty_struct *tty, struct file *file)
        struct gs_port  *port;
        int             status;
-        if (port_num < 0 || port_num >= n_ports)
-                return -ENXIO;
        do {
                mutex_lock(&ports[port_num].lock);
                port = ports[port_num].port;
@@ -1087,7 +1084,6 @@ int __init gserial_setup(struct usb_gadget *g, unsigned count)
        if (!gs_tty_driver)
                return -ENOMEM;
-        gs_tty_driver->owner = THIS_MODULE;
        gs_tty_driver->driver_name = "g_serial";
        gs_tty_driver->name = PREFIX;
        /* uses dynamically assigned dev_t values */
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 611b206591cb..d4e724d9b1f4 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -214,15 +214,14 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty)
        if (!try_module_get(serial->type->driver.owner))
                goto error_module_get;
-        /* perform the standard setup */
-        retval = tty_init_termios(tty);
-        if (retval)
-                goto error_init_termios;
        retval = usb_autopm_get_interface(serial->interface);
        if (retval)
                goto error_get_interface;
+        retval = tty_standard_install(driver, tty);
+        if (retval)
+                goto error_init_termios;
        mutex_unlock(&serial->disc_mutex);
        /* allow the driver to update the settings */
@@ -231,14 +230,11 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty)
        tty->driver_data = port;
-        /* Final install (we use the default method) */
-        tty_driver_kref_get(driver);
-        tty->count++;
-        driver->ttys[idx] = tty;
        return retval;
- error_get_interface:
 error_init_termios:
+        usb_autopm_put_interface(serial->interface);
+ error_get_interface:
        module_put(serial->type->driver.owner);
 error_module_get:
 error_no_port:
@@ -1239,7 +1235,6 @@ static int __init usb_serial_init(void)
                goto exit_bus;
        }
-        usb_serial_tty_driver->owner = THIS_MODULE;
        usb_serial_tty_driver->driver_name = "usbserial";
        usb_serial_tty_driver->name = "ttyUSB";
        usb_serial_tty_driver->major = SERIAL_TTY_MAJOR;