51 files changed, 757 insertions, 702 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index cb6d85d7ff43..1e3d19397a59 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -86,7 +86,7 @@ static void serial21285_enable_ms(struct uart_port *port)
 static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        unsigned int status, ch, flag, rxs, max_count = 256;
        status = *CSR_UARTFLG;
@@ -124,7 +124,7 @@ static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)
 static irqreturn_t serial21285_tx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        int count = 256;
        if (port->x_char) {
@@ -235,8 +235,8 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
        quot = uart_get_divisor(port, baud);
-        if (port->info && port->info->port.tty) {
+        if (port->state && port->state->port.tty) {
-                struct tty_struct *tty = port->info->port.tty;
+                struct tty_struct *tty = port->state->port.tty;
                unsigned int b = port->uartclk / (16 * quot);
                tty_encode_baud_rate(tty, b, b);
        }
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index fb867a9f55e9..2209620d2349 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1382,7 +1382,7 @@ static void serial8250_enable_ms(struct uart_port *port)
 static void
 receive_chars(struct uart_8250_port *up, unsigned int *status)
 {
-        struct tty_struct *tty = up->port.info->port.tty;
+        struct tty_struct *tty = up->port.state->port.tty;
        unsigned char ch, lsr = *status;
        int max_count = 256;
        char flag;
@@ -1457,7 +1457,7 @@ ignore_char:
 static void transmit_chars(struct uart_8250_port *up)
 {
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        int count;
        if (up->port.x_char) {
@@ -1500,7 +1500,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
        status |= up->msr_saved_flags;
        up->msr_saved_flags = 0;
        if (status & UART_MSR_ANY_DELTA && up->ier & UART_IER_MSI &&
-            up->port.info != NULL) {
+            up->port.state != NULL) {
                if (status & UART_MSR_TERI)
                        up->port.icount.rng++;
                if (status & UART_MSR_DDSR)
@@ -1510,7 +1510,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
                if (status & UART_MSR_DCTS)
                        uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
-                wake_up_interruptible(&up->port.info->delta_msr_wait);
+                wake_up_interruptible(&up->port.state->port.delta_msr_wait);
        }
        return status;
@@ -1677,7 +1677,7 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
                INIT_LIST_HEAD(&up->list);
                i->head = &up->list;
                spin_unlock_irq(&i->lock);
+                irq_flags |= up->port.irqflags;
                ret = request_irq(up->port.irq, serial8250_interrupt,
                                  irq_flags, "serial", i);
                if (ret < 0)
@@ -1764,7 +1764,7 @@ static void serial8250_backup_timeout(unsigned long data)
        up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
        spin_unlock_irqrestore(&up->port.lock, flags);
        if ((iir & UART_IIR_NO_INT) && (up->ier & UART_IER_THRI) &&
-            (!uart_circ_empty(&up->port.info->xmit) || up->port.x_char) &&
+            (!uart_circ_empty(&up->port.state->xmit) || up->port.x_char) &&
            (lsr & UART_LSR_THRE)) {
                iir &= ~(UART_IIR_ID | UART_IIR_NO_INT);
                iir |= UART_IIR_THRI;
@@ -2026,7 +2026,7 @@ static int serial8250_startup(struct uart_port *port)
                 * allow register changes to become visible.
                 */
                spin_lock_irqsave(&up->port.lock, flags);
-                if (up->port.flags & UPF_SHARE_IRQ)
+                if (up->port.irqflags & IRQF_SHARED)
                        disable_irq_nosync(up->port.irq);
                wait_for_xmitr(up, UART_LSR_THRE);
@@ -2039,7 +2039,7 @@ static int serial8250_startup(struct uart_port *port)
                iir = serial_in(up, UART_IIR);
                serial_out(up, UART_IER, 0);
-                if (up->port.flags & UPF_SHARE_IRQ)
+                if (up->port.irqflags & IRQF_SHARED)
                        enable_irq(up->port.irq);
                spin_unlock_irqrestore(&up->port.lock, flags);
@@ -2272,7 +2272,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
        /*
         * Ask the core to calculate the divisor for us.
         */
-        baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
+        baud = uart_get_baud_rate(port, termios, old,
+                                  port->uartclk / 16 / 0xffff,
+                                  port->uartclk / 16);
        quot = serial8250_get_divisor(port, baud);
        /*
@@ -2671,6 +2673,7 @@ static void __init serial8250_isa_init_ports(void)
             i++, up++) {
                up->port.iobase   = old_serial_port[i].port;
                up->port.irq      = irq_canonicalize(old_serial_port[i].irq);
+                up->port.irqflags = old_serial_port[i].irqflags;
                up->port.uartclk  = old_serial_port[i].baud_base * 16;
                up->port.flags    = old_serial_port[i].flags;
                up->port.hub6     = old_serial_port[i].hub6;
@@ -2679,7 +2682,7 @@ static void __init serial8250_isa_init_ports(void)
                up->port.regshift = old_serial_port[i].iomem_reg_shift;
                set_io_from_upio(&up->port);
                if (share_irqs)
-                        up->port.flags |= UPF_SHARE_IRQ;
+                        up->port.irqflags |= IRQF_SHARED;
        }
 }
@@ -2869,6 +2872,7 @@ int __init early_serial_setup(struct uart_port *port)
        p->iobase       = port->iobase;
        p->membase      = port->membase;
        p->irq          = port->irq;
+        p->irqflags     = port->irqflags;
        p->uartclk      = port->uartclk;
        p->fifosize     = port->fifosize;
        p->regshift     = port->regshift;
@@ -2942,6 +2946,7 @@ static int __devinit serial8250_probe(struct platform_device *dev)
                port.iobase             = p->iobase;
                port.membase            = p->membase;
                port.irq                = p->irq;
+                port.irqflags           = p->irqflags;
                port.uartclk            = p->uartclk;
                port.regshift           = p->regshift;
                port.iotype             = p->iotype;
@@ -2954,7 +2959,7 @@ static int __devinit serial8250_probe(struct platform_device *dev)
                port.serial_out         = p->serial_out;
                port.dev                = &dev->dev;
                if (share_irqs)
-                        port.flags |= UPF_SHARE_IRQ;
+                        port.irqflags |= IRQF_SHARED;
                ret = serial8250_register_port(&port);
                if (ret < 0) {
                        dev_err(&dev->dev, "unable to register port at index %d "
@@ -3096,6 +3101,7 @@ int serial8250_register_port(struct uart_port *port)
                uart->port.iobase       = port->iobase;
                uart->port.membase      = port->membase;
                uart->port.irq          = port->irq;
+                uart->port.irqflags     = port->irqflags;
                uart->port.uartclk      = port->uartclk;
                uart->port.fifosize     = port->fifosize;
                uart->port.regshift     = port->regshift;
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index 520260326f3d..6e19ea3e48d5 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -25,6 +25,7 @@ struct old_serial_port {
        unsigned char io_type;
        unsigned char *iomem_base;
        unsigned short iomem_reg_shift;
+        unsigned long irqflags;
 };
 /*
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 58a4879c7e48..429a8ae86933 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -117,7 +117,7 @@ static void pl010_enable_ms(struct uart_port *port)
 static void pl010_rx_chars(struct uart_amba_port *uap)
 {
-        struct tty_struct *tty = uap->port.info->port.tty;
+        struct tty_struct *tty = uap->port.state->port.tty;
        unsigned int status, ch, flag, rsr, max_count = 256;
        status = readb(uap->port.membase + UART01x_FR);
@@ -172,7 +172,7 @@ static void pl010_rx_chars(struct uart_amba_port *uap)
 static void pl010_tx_chars(struct uart_amba_port *uap)
 {
-        struct circ_buf *xmit = &uap->port.info->xmit;
+        struct circ_buf *xmit = &uap->port.state->xmit;
        int count;
        if (uap->port.x_char) {
@@ -225,7 +225,7 @@ static void pl010_modem_status(struct uart_amba_port *uap)
        if (delta & UART01x_FR_CTS)
                uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
-        wake_up_interruptible(&uap->port.info->delta_msr_wait);
+        wake_up_interruptible(&uap->port.state->port.delta_msr_wait);
 }
 static irqreturn_t pl010_int(int irq, void *dev_id)
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 72ba0c6d3551..ef7adc8135dd 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -124,7 +124,7 @@ static void pl011_enable_ms(struct uart_port *port)
 static void pl011_rx_chars(struct uart_amba_port *uap)
 {
-        struct tty_struct *tty = uap->port.info->port.tty;
+        struct tty_struct *tty = uap->port.state->port.tty;
        unsigned int status, ch, flag, max_count = 256;
        status = readw(uap->port.membase + UART01x_FR);
@@ -175,7 +175,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap)
 static void pl011_tx_chars(struct uart_amba_port *uap)
 {
-        struct circ_buf *xmit = &uap->port.info->xmit;
+        struct circ_buf *xmit = &uap->port.state->xmit;
        int count;
        if (uap->port.x_char) {
@@ -226,7 +226,7 @@ static void pl011_modem_status(struct uart_amba_port *uap)
        if (delta & UART01x_FR_CTS)
                uart_handle_cts_change(&uap->port, status & UART01x_FR_CTS);
-        wake_up_interruptible(&uap->port.info->delta_msr_wait);
+        wake_up_interruptible(&uap->port.state->port.delta_msr_wait);
 }
 static irqreturn_t pl011_int(int irq, void *dev_id)
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 607d43a31048..3551c5cb7094 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -427,7 +427,7 @@ static void atmel_rx_chars(struct uart_port *port)
 */
 static void atmel_tx_chars(struct uart_port *port)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        if (port->x_char && UART_GET_CSR(port) & ATMEL_US_TXRDY) {
                UART_PUT_CHAR(port, port->x_char);
@@ -560,7 +560,7 @@ static irqreturn_t atmel_interrupt(int irq, void *dev_id)
 static void atmel_tx_dma(struct uart_port *port)
 {
        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
        int count;
@@ -663,14 +663,14 @@ static void atmel_rx_from_ring(struct uart_port *port)
         * uart_start(), which takes the lock.
         */
        spin_unlock(&port->lock);
-        tty_flip_buffer_push(port->info->port.tty);
+        tty_flip_buffer_push(port->state->port.tty);
        spin_lock(&port->lock);
 }
 static void atmel_rx_from_dma(struct uart_port *port)
 {
        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        struct atmel_dma_buffer *pdc;
        int rx_idx = atmel_port->pdc_rx_idx;
        unsigned int head;
@@ -776,7 +776,7 @@ static void atmel_tasklet_func(unsigned long data)
                if (status_change & ATMEL_US_CTS)
                        uart_handle_cts_change(port, !(status & ATMEL_US_CTS));
-                wake_up_interruptible(&port->info->delta_msr_wait);
+                wake_up_interruptible(&port->state->port.delta_msr_wait);
                atmel_port->irq_status_prev = status;
        }
@@ -795,7 +795,7 @@ static void atmel_tasklet_func(unsigned long data)
 static int atmel_startup(struct uart_port *port)
 {
        struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        int retval;
        /*
@@ -854,7 +854,7 @@ static int atmel_startup(struct uart_port *port)
        }
        if (atmel_use_dma_tx(port)) {
                struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
-                struct circ_buf *xmit = &port->info->xmit;
+                struct circ_buf *xmit = &port->state->xmit;
                pdc->buf = xmit->buf;
                pdc->dma_addr = dma_map_single(port->dev,
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index b4a7650af696..50abb7e557f4 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -42,6 +42,10 @@
 # undef CONFIG_EARLY_PRINTK
 #endif
+#ifdef CONFIG_SERIAL_BFIN_MODULE
+# undef CONFIG_EARLY_PRINTK
+#endif
 /* UART name and device definitions */
 #define BFIN_SERIAL_NAME        "ttyBF"
 #define BFIN_SERIAL_MAJOR       204
@@ -140,7 +144,7 @@ static void bfin_serial_stop_tx(struct uart_port *port)
 {
        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
 #ifdef CONFIG_SERIAL_BFIN_DMA
-        struct circ_buf *xmit = &uart->port.info->xmit;
+        struct circ_buf *xmit = &uart->port.state->xmit;
 #endif
        while (!(UART_GET_LSR(uart) & TEMT))
@@ -167,7 +171,7 @@ static void bfin_serial_stop_tx(struct uart_port *port)
 static void bfin_serial_start_tx(struct uart_port *port)
 {
        struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-        struct tty_struct *tty = uart->port.info->port.tty;
+        struct tty_struct *tty = uart->port.state->port.tty;
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
        if (uart->scts && !(bfin_serial_get_mctrl(&uart->port) & TIOCM_CTS)) {
@@ -239,10 +243,10 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
                        return;
                }
-        if (!uart->port.info || !uart->port.info->port.tty)
+        if (!uart->port.state || !uart->port.state->port.tty)
                return;
 #endif
-        tty = uart->port.info->port.tty;
+        tty = uart->port.state->port.tty;
        if (ANOMALY_05000363) {
                /* The BF533 (and BF561) family of processors have a nice anomaly
@@ -327,7 +331,7 @@ static void bfin_serial_rx_chars(struct bfin_serial_port *uart)
 static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
 {
-        struct circ_buf *xmit = &uart->port.info->xmit;
+        struct circ_buf *xmit = &uart->port.state->xmit;
        if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
 #ifdef CONFIG_BF54x
@@ -394,7 +398,7 @@ static irqreturn_t bfin_serial_tx_int(int irq, void *dev_id)
 #ifdef CONFIG_SERIAL_BFIN_DMA
 static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
 {
-        struct circ_buf *xmit = &uart->port.info->xmit;
+        struct circ_buf *xmit = &uart->port.state->xmit;
        uart->tx_done = 0;
@@ -432,7 +436,7 @@ static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
 static void bfin_serial_dma_rx_chars(struct bfin_serial_port *uart)
 {
-        struct tty_struct *tty = uart->port.info->port.tty;
+        struct tty_struct *tty = uart->port.state->port.tty;
        int i, flg, status;
        status = UART_GET_LSR(uart);
@@ -525,7 +529,7 @@ void bfin_serial_rx_dma_timeout(struct bfin_serial_port *uart)
 static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
 {
        struct bfin_serial_port *uart = dev_id;
-        struct circ_buf *xmit = &uart->port.info->xmit;
+        struct circ_buf *xmit = &uart->port.state->xmit;
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
        if (uart->scts && !(bfin_serial_get_mctrl(&uart->port)&TIOCM_CTS)) {
@@ -961,10 +965,10 @@ static void bfin_serial_set_ldisc(struct uart_port *port)
        int line = port->line;
        unsigned short val;
-        if (line >= port->info->port.tty->driver->num)
+        if (line >= port->state->port.tty->driver->num)
                return;
-        switch (port->info->port.tty->termios->c_line) {
+        switch (port->state->port.tty->termios->c_line) {
        case N_IRDA:
                val = UART_GET_GCTL(&bfin_serial_ports[line]);
                val |= (IREN | RPOLC);
diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/serial/bfin_sport_uart.c
index c108b1a0ce98..088bb35475f1 100644
--- a/drivers/serial/bfin_sport_uart.c
+++ b/drivers/serial/bfin_sport_uart.c
@@ -178,7 +178,7 @@ static int sport_uart_setup(struct sport_uart_port *up, int sclk, int baud_rate)
 static irqreturn_t sport_uart_rx_irq(int irq, void *dev_id)
 {
        struct sport_uart_port *up = dev_id;
-        struct tty_struct *tty = up->port.info->port.tty;
+        struct tty_struct *tty = up->port.state->port.tty;
        unsigned int ch;
        do {
@@ -205,7 +205,7 @@ static irqreturn_t sport_uart_tx_irq(int irq, void *dev_id)
 static irqreturn_t sport_uart_err_irq(int irq, void *dev_id)
 {
        struct sport_uart_port *up = dev_id;
-        struct tty_struct *tty = up->port.info->port.tty;
+        struct tty_struct *tty = up->port.state->port.tty;
        unsigned int stat = SPORT_GET_STAT(up);
        /* Overflow in RX FIFO */
@@ -290,7 +290,7 @@ fail1:
 static void sport_uart_tx_chars(struct sport_uart_port *up)
 {
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        if (SPORT_GET_STAT(up) & TXF)
                return;
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 80e76426131d..b6acd19b458e 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -93,7 +93,7 @@ static void clps711xuart_enable_ms(struct uart_port *port)
 static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        unsigned int status, ch, flg;
        status = clps_readl(SYSFLG(port));
@@ -147,7 +147,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id)
 static irqreturn_t clps711xuart_int_tx(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        int count;
        if (port->x_char) {
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index f8df0681e160..8d349b23249a 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -244,7 +244,7 @@ static void cpm_uart_int_rx(struct uart_port *port)
        int i;
        unsigned char ch;
        u8 *cp;
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
        cbd_t __iomem *bdp;
        u16 status;
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index 6042b87797a1..57421d776329 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -197,7 +197,7 @@ static inline void dz_receive_chars(struct dz_mux *mux)
        while ((status = dz_in(dport, DZ_RBUF)) & DZ_DVAL) {
                dport = &mux->dport[LINE(status)];
                uport = &dport->port;
-                tty = uport->info->port.tty;    /* point to the proper dev */
+                tty = uport->state->port.tty;   /* point to the proper dev */
                ch = UCHAR(status);             /* grab the char */
                flag = TTY_NORMAL;
@@ -249,7 +249,7 @@ static inline void dz_receive_chars(struct dz_mux *mux)
        }
        for (i = 0; i < DZ_NB_PORT; i++)
                if (lines_rx[i])
-                        tty_flip_buffer_push(mux->dport[i].port.info->port.tty);
+                        tty_flip_buffer_push(mux->dport[i].port.state->port.tty);
 }
 /*
@@ -268,7 +268,7 @@ static inline void dz_transmit_chars(struct dz_mux *mux)
        status = dz_in(dport, DZ_CSR);
        dport = &mux->dport[LINE(status)];
-        xmit = &dport->port.info->xmit;
+        xmit = &dport->port.state->xmit;
        if (dport->port.x_char) {               /* XON/XOFF chars */
                dz_out(dport, DZ_TDR, dport->port.x_char);
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index cd1b6a45bb82..2d7feecaf492 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -617,7 +617,7 @@ static void shutdown(struct icom_port *icom_port)
         * disable break condition
         */
        cmdReg = readb(&icom_port->dram->CmdReg);
-        if ((cmdReg | CMD_SND_BREAK) == CMD_SND_BREAK) {
+        if (cmdReg & CMD_SND_BREAK) {
                writeb(cmdReg & ~CMD_SND_BREAK, &icom_port->dram->CmdReg);
        }
 }
@@ -627,7 +627,7 @@ static int icom_write(struct uart_port *port)
        unsigned long data_count;
        unsigned char cmdReg;
        unsigned long offset;
-        int temp_tail = port->info->xmit.tail;
+        int temp_tail = port->state->xmit.tail;
        trace(ICOM_PORT, "WRITE", 0);
@@ -638,11 +638,11 @@ static int icom_write(struct uart_port *port)
        }
        data_count = 0;
-        while ((port->info->xmit.head != temp_tail) &&
+        while ((port->state->xmit.head != temp_tail) &&
               (data_count <= XMIT_BUFF_SZ)) {
                ICOM_PORT->xmit_buf[data_count++] =
-                    port->info->xmit.buf[temp_tail];
+                    port->state->xmit.buf[temp_tail];
                temp_tail++;
                temp_tail &= (UART_XMIT_SIZE - 1);
@@ -694,8 +694,8 @@ static inline void check_modem_status(struct icom_port *icom_port)
                        uart_handle_cts_change(&icom_port->uart_port,
                                               delta_status & ICOM_CTS);
-                wake_up_interruptible(&icom_port->uart_port.info->
+                wake_up_interruptible(&icom_port->uart_port.state->
-                                      delta_msr_wait);
+                                      port.delta_msr_wait);
                old_status = status;
        }
        spin_unlock(&icom_port->uart_port.lock);
@@ -718,10 +718,10 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port)
                icom_port->uart_port.icount.tx += count;
                for (i=0; i<count &&
-                        !uart_circ_empty(&icom_port->uart_port.info->xmit); i++) {
+                        !uart_circ_empty(&icom_port->uart_port.state->xmit); i++) {
-                        icom_port->uart_port.info->xmit.tail++;
+                        icom_port->uart_port.state->xmit.tail++;
-                        icom_port->uart_port.info->xmit.tail &=
+                        icom_port->uart_port.state->xmit.tail &=
                                (UART_XMIT_SIZE - 1);
                }
@@ -735,7 +735,7 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 {
        short int count, rcv_buff;
-        struct tty_struct *tty = icom_port->uart_port.info->port.tty;
+        struct tty_struct *tty = icom_port->uart_port.state->port.tty;
        unsigned short int status;
        struct uart_icount *icount;
        unsigned long offset;
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 7485afd0df4c..18130f11238e 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -224,7 +224,7 @@ static void imx_mctrl_check(struct imx_port *sport)
        if (changed & TIOCM_CTS)
                uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
-        wake_up_interruptible(&sport->port.info->delta_msr_wait);
+        wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
 }
 /*
@@ -236,7 +236,7 @@ static void imx_timeout(unsigned long data)
        struct imx_port *sport = (struct imx_port *)data;
        unsigned long flags;
-        if (sport->port.info) {
+        if (sport->port.state) {
                spin_lock_irqsave(&sport->port.lock, flags);
                imx_mctrl_check(sport);
                spin_unlock_irqrestore(&sport->port.lock, flags);
@@ -323,7 +323,7 @@ static void imx_enable_ms(struct uart_port *port)
 static inline void imx_transmit_buffer(struct imx_port *sport)
 {
-        struct circ_buf *xmit = &sport->port.info->xmit;
+        struct circ_buf *xmit = &sport->port.state->xmit;
        while (!(readl(sport->port.membase + UTS) & UTS_TXFULL)) {
                /* send xmit->buf[xmit->tail]
@@ -388,7 +388,7 @@ static irqreturn_t imx_rtsint(int irq, void *dev_id)
        writel(USR1_RTSD, sport->port.membase + USR1);
        uart_handle_cts_change(&sport->port, !!val);
-        wake_up_interruptible(&sport->port.info->delta_msr_wait);
+        wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
        spin_unlock_irqrestore(&sport->port.lock, flags);
        return IRQ_HANDLED;
@@ -397,7 +397,7 @@ static irqreturn_t imx_rtsint(int irq, void *dev_id)
 static irqreturn_t imx_txint(int irq, void *dev_id)
 {
        struct imx_port *sport = dev_id;
-        struct circ_buf *xmit = &sport->port.info->xmit;
+        struct circ_buf *xmit = &sport->port.state->xmit;
        unsigned long flags;
        spin_lock_irqsave(&sport->port.lock,flags);
@@ -427,7 +427,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
 {
        struct imx_port *sport = dev_id;
        unsigned int rx,flg,ignored = 0;
-        struct tty_struct *tty = sport->port.info->port.tty;
+        struct tty_struct *tty = sport->port.state->port.tty;
        unsigned long flags, temp;
        spin_lock_irqsave(&sport->port.lock,flags);
@@ -900,11 +900,11 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
        rational_best_approximation(16 * div * baud, sport->port.uartclk,
                1 << 16, 1 << 16, &num, &denom);
-        if (port->info && port->info->port.tty) {
+        if (port->state && port->state->port.tty) {
                tdiv64 = sport->port.uartclk;
                tdiv64 *= num;
                do_div(tdiv64, denom * 16 * div);
-                tty_encode_baud_rate(sport->port.info->port.tty,
+                tty_encode_baud_rate(sport->port.state->port.tty,
                                (speed_t)tdiv64, (speed_t)tdiv64);
        }
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index ae3699d77dd0..d8983dd5c4b2 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -897,25 +897,25 @@ static void transmit_chars(struct uart_port *the_port)
        char *start;
        struct tty_struct *tty;
        struct ioc3_port *port = get_ioc3_port(the_port);
-        struct uart_info *info;
+        struct uart_state *state;
        if (!the_port)
                return;
        if (!port)
                return;
-        info = the_port->info;
+        state = the_port->state;
-        tty = info->port.tty;
+        tty = state->port.tty;
-        if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) {
+        if (uart_circ_empty(&state->xmit) || uart_tx_stopped(the_port)) {
                /* Nothing to do or hw stopped */
                set_notification(port, N_ALL_OUTPUT, 0);
                return;
        }
-        head = info->xmit.head;
+        head = state->xmit.head;
-        tail = info->xmit.tail;
+        tail = state->xmit.tail;
-        start = (char *)&info->xmit.buf[tail];
+        start = (char *)&state->xmit.buf[tail];
        /* write out all the data or until the end of the buffer */
        xmit_count = (head < tail) ? (UART_XMIT_SIZE - tail) : (head - tail);
@@ -928,14 +928,14 @@ static void transmit_chars(struct uart_port *the_port)
                        /* advance the pointers */
                        tail += result;
                        tail &= UART_XMIT_SIZE - 1;
-                        info->xmit.tail = tail;
+                        state->xmit.tail = tail;
-                        start = (char *)&info->xmit.buf[tail];
+                        start = (char *)&state->xmit.buf[tail];
                }
        }
-        if (uart_circ_chars_pending(&info->xmit) < WAKEUP_CHARS)
+        if (uart_circ_chars_pending(&state->xmit) < WAKEUP_CHARS)
                uart_write_wakeup(the_port);
-        if (uart_circ_empty(&info->xmit)) {
+        if (uart_circ_empty(&state->xmit)) {
                set_notification(port, N_OUTPUT_LOWAT, 0);
        } else {
                set_notification(port, N_OUTPUT_LOWAT, 1);
@@ -956,7 +956,7 @@ ioc3_change_speed(struct uart_port *the_port,
        unsigned int cflag;
        int baud;
        int new_parity = 0, new_parity_enable = 0, new_stop = 0, new_data = 8;
-        struct uart_info *info = the_port->info;
+        struct uart_state *state = the_port->state;
        cflag = new_termios->c_cflag;
@@ -997,14 +997,14 @@ ioc3_change_speed(struct uart_port *the_port,
        the_port->ignore_status_mask = N_ALL_INPUT;
-        info->port.tty->low_latency = 1;
+        state->port.tty->low_latency = 1;
-        if (I_IGNPAR(info->port.tty))
+        if (I_IGNPAR(state->port.tty))
                the_port->ignore_status_mask &= ~(N_PARITY_ERROR
                                                  | N_FRAMING_ERROR);
-        if (I_IGNBRK(info->port.tty)) {
+        if (I_IGNBRK(state->port.tty)) {
                the_port->ignore_status_mask &= ~N_BREAK;
-                if (I_IGNPAR(info->port.tty))
+                if (I_IGNPAR(state->port.tty))
                        the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
        }
        if (!(cflag & CREAD)) {
@@ -1286,8 +1286,8 @@ static inline int do_read(struct uart_port *the_port, char *buf, int len)
                                                uart_handle_dcd_change
                                                        (port->ip_port, 0);
                                                wake_up_interruptible
-                                                    (&the_port->info->
+                                                    (&the_port->state->
-                                                     delta_msr_wait);
+                                                     port.delta_msr_wait);
                                        }
                                        /* If we had any data to return, we
@@ -1392,21 +1392,21 @@ static int receive_chars(struct uart_port *the_port)
        struct tty_struct *tty;
        unsigned char ch[MAX_CHARS];
        int read_count = 0, read_room, flip = 0;
-        struct uart_info *info = the_port->info;
+        struct uart_state *state = the_port->state;
        struct ioc3_port *port = get_ioc3_port(the_port);
        unsigned long pflags;
        /* Make sure all the pointers are "good" ones */
-        if (!info)
+        if (!state)
                return 0;
-        if (!info->port.tty)
+        if (!state->port.tty)
                return 0;
        if (!(port->ip_flags & INPUT_ENABLE))
                return 0;
        spin_lock_irqsave(&the_port->lock, pflags);
-        tty = info->port.tty;
+        tty = state->port.tty;
        read_count = do_read(the_port, ch, MAX_CHARS);
        if (read_count > 0) {
@@ -1491,7 +1491,7 @@ ioc3uart_intr_one(struct ioc3_submodule *is,
                                uart_handle_dcd_change(the_port,
                                                shadow & SHADOW_DCD);
                                wake_up_interruptible
-                                    (&the_port->info->delta_msr_wait);
+                                    (&the_port->state->port.delta_msr_wait);
                        } else if ((port->ip_notify & N_DDCD)
                                   && !(shadow & SHADOW_DCD)) {
                                /* Flag delta DCD/no DCD */
@@ -1511,7 +1511,7 @@ ioc3uart_intr_one(struct ioc3_submodule *is,
                                uart_handle_cts_change(the_port, shadow
                                                & SHADOW_CTS);
                                wake_up_interruptible
-                                    (&the_port->info->delta_msr_wait);
+                                    (&the_port->state->port.delta_msr_wait);
                        }
                }
@@ -1721,14 +1721,14 @@ static void ic3_shutdown(struct uart_port *the_port)
 {
        unsigned long port_flags;
        struct ioc3_port *port;
-        struct uart_info *info;
+        struct uart_state *state;
        port = get_ioc3_port(the_port);
        if (!port)
                return;
-        info = the_port->info;
+        state = the_port->state;
-        wake_up_interruptible(&info->delta_msr_wait);
+        wake_up_interruptible(&state->port.delta_msr_wait);
        spin_lock_irqsave(&the_port->lock, port_flags);
        set_notification(port, N_ALL, 0);
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 6bab63cd5b29..2e02c3026d24 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -930,7 +930,7 @@ static void handle_dma_error_intr(void *arg, uint32_t other_ir)
        if (readl(&port->ip_mem->pci_err_addr_l.raw) & IOC4_PCI_ERR_ADDR_VLD) {
                printk(KERN_ERR
-                        "PCI error address is 0x%lx, "
+                        "PCI error address is 0x%llx, "
                                "master is serial port %c %s\n",
                     (((uint64_t)readl(&port->ip_mem->pci_err_addr_h)
                                                         << 32)
@@ -1627,25 +1627,25 @@ static void transmit_chars(struct uart_port *the_port)
        char *start;
        struct tty_struct *tty;
        struct ioc4_port *port = get_ioc4_port(the_port, 0);
-        struct uart_info *info;
+        struct uart_state *state;
        if (!the_port)
                return;
        if (!port)
                return;
-        info = the_port->info;
+        state = the_port->state;
-        tty = info->port.tty;
+        tty = state->port.tty;
-        if (uart_circ_empty(&info->xmit) || uart_tx_stopped(the_port)) {
+        if (uart_circ_empty(&state->xmit) || uart_tx_stopped(the_port)) {
                /* Nothing to do or hw stopped */
                set_notification(port, N_ALL_OUTPUT, 0);
                return;
        }
-        head = info->xmit.head;
+        head = state->xmit.head;
-        tail = info->xmit.tail;
+        tail = state->xmit.tail;
-        start = (char *)&info->xmit.buf[tail];
+        start = (char *)&state->xmit.buf[tail];
        /* write out all the data or until the end of the buffer */
        xmit_count = (head < tail) ? (UART_XMIT_SIZE - tail) : (head - tail);
@@ -1658,14 +1658,14 @@ static void transmit_chars(struct uart_port *the_port)
                        /* advance the pointers */
                        tail += result;
                        tail &= UART_XMIT_SIZE - 1;
-                        info->xmit.tail = tail;
+                        state->xmit.tail = tail;
-                        start = (char *)&info->xmit.buf[tail];
+                        start = (char *)&state->xmit.buf[tail];
                }
        }
-        if (uart_circ_chars_pending(&info->xmit) < WAKEUP_CHARS)
+        if (uart_circ_chars_pending(&state->xmit) < WAKEUP_CHARS)
                uart_write_wakeup(the_port);
-        if (uart_circ_empty(&info->xmit)) {
+        if (uart_circ_empty(&state->xmit)) {
                set_notification(port, N_OUTPUT_LOWAT, 0);
        } else {
                set_notification(port, N_OUTPUT_LOWAT, 1);
@@ -1686,7 +1686,7 @@ ioc4_change_speed(struct uart_port *the_port,
        int baud, bits;
        unsigned cflag;
        int new_parity = 0, new_parity_enable = 0, new_stop = 0, new_data = 8;
-        struct uart_info *info = the_port->info;
+        struct uart_state *state = the_port->state;
        cflag = new_termios->c_cflag;
@@ -1738,14 +1738,14 @@ ioc4_change_speed(struct uart_port *the_port,
        the_port->ignore_status_mask = N_ALL_INPUT;
-        info->port.tty->low_latency = 1;
+        state->port.tty->low_latency = 1;
-        if (I_IGNPAR(info->port.tty))
+        if (I_IGNPAR(state->port.tty))
                the_port->ignore_status_mask &= ~(N_PARITY_ERROR
                                                | N_FRAMING_ERROR);
-        if (I_IGNBRK(info->port.tty)) {
+        if (I_IGNBRK(state->port.tty)) {
                the_port->ignore_status_mask &= ~N_BREAK;
-                if (I_IGNPAR(info->port.tty))
+                if (I_IGNPAR(state->port.tty))
                        the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
        }
        if (!(cflag & CREAD)) {
@@ -1784,7 +1784,7 @@ ioc4_change_speed(struct uart_port *the_port,
 static inline int ic4_startup_local(struct uart_port *the_port)
 {
        struct ioc4_port *port;
-        struct uart_info *info;
+        struct uart_state *state;
        if (!the_port)
                return -1;
@@ -1793,7 +1793,7 @@ static inline int ic4_startup_local(struct uart_port *the_port)
        if (!port)
                return -1;
-        info = the_port->info;
+        state = the_port->state;
        local_open(port);
@@ -1801,7 +1801,7 @@ static inline int ic4_startup_local(struct uart_port *the_port)
        ioc4_set_proto(port, the_port->mapbase);
        /* set the speed of the serial port */
-        ioc4_change_speed(the_port, info->port.tty->termios,
+        ioc4_change_speed(the_port, state->port.tty->termios,
                          (struct ktermios *)0);
        return 0;
@@ -1882,7 +1882,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                                the_port = port->ip_port;
                                the_port->icount.dcd = 1;
                                wake_up_interruptible
-                                            (&the_port-> info->delta_msr_wait);
+                                            (&the_port->state->port.delta_msr_wait);
                        } else if ((port->ip_notify & N_DDCD)
                                        && !(shadow & IOC4_SHADOW_DCD)) {
                                /* Flag delta DCD/no DCD */
@@ -1904,7 +1904,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
                                the_port->icount.cts =
                                        (shadow & IOC4_SHADOW_CTS) ? 1 : 0;
                                wake_up_interruptible
-                                        (&the_port->info->delta_msr_wait);
+                                        (&the_port->state->port.delta_msr_wait);
                        }
                }
@@ -2236,8 +2236,8 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
                                                   && port->ip_port) {
                                                the_port->icount.dcd = 0;
                                                wake_up_interruptible
-                                                    (&the_port->info->
+                                                    (&the_port->state->
-                                                        delta_msr_wait);
+                                                        port.delta_msr_wait);
                                        }
                                        /* If we had any data to return, we
@@ -2341,17 +2341,17 @@ static void receive_chars(struct uart_port *the_port)
        unsigned char ch[IOC4_MAX_CHARS];
        int read_count, request_count = IOC4_MAX_CHARS;
        struct uart_icount *icount;
-        struct uart_info *info = the_port->info;
+        struct uart_state *state = the_port->state;
        unsigned long pflags;
        /* Make sure all the pointers are "good" ones */
-        if (!info)
+        if (!state)
                return;
-        if (!info->port.tty)
+        if (!state->port.tty)
                return;
        spin_lock_irqsave(&the_port->lock, pflags);
-        tty = info->port.tty;
+        tty = state->port.tty;
        request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS);
@@ -2430,19 +2430,19 @@ static void ic4_shutdown(struct uart_port *the_port)
 {
        unsigned long port_flags;
        struct ioc4_port *port;
-        struct uart_info *info;
+        struct uart_state *state;
        port = get_ioc4_port(the_port, 0);
        if (!port)
                return;
-        info = the_port->info;
+        state = the_port->state;
        port->ip_port = NULL;
-        wake_up_interruptible(&info->delta_msr_wait);
+        wake_up_interruptible(&state->port.delta_msr_wait);
-        if (info->port.tty)
+        if (state->port.tty)
-                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+                set_bit(TTY_IO_ERROR, &state->port.tty->flags);
        spin_lock_irqsave(&the_port->lock, port_flags);
        set_notification(port, N_ALL, 0);
@@ -2538,7 +2538,7 @@ static int ic4_startup(struct uart_port *the_port)
        int retval;
        struct ioc4_port *port;
        struct ioc4_control *control;
-        struct uart_info *info;
+        struct uart_state *state;
        unsigned long port_flags;
        if (!the_port)
@@ -2546,7 +2546,7 @@ static int ic4_startup(struct uart_port *the_port)
        port = get_ioc4_port(the_port, 1);
        if (!port)
                return -ENODEV;
-        info = the_port->info;
+        state = the_port->state;
        control = port->ip_control;
        if (!control) {
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index 0d9acbd0bb70..ebff4a1d4bcc 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -256,9 +256,9 @@ static struct tty_struct *ip22zilog_receive_chars(struct uart_ip22zilog_port *up
        unsigned int r1;
        tty = NULL;
-        if (up->port.info != NULL &&
+        if (up->port.state != NULL &&
-            up->port.info->port.tty != NULL)
+            up->port.state->port.tty != NULL)
-                tty = up->port.info->port.tty;
+                tty = up->port.state->port.tty;
        for (;;) {
                ch = readb(&channel->control);
@@ -354,7 +354,7 @@ static void ip22zilog_status_handle(struct uart_ip22zilog_port *up,
                        uart_handle_cts_change(&up->port,
                                               (status & CTS));
-                wake_up_interruptible(&up->port.info->delta_msr_wait);
+                wake_up_interruptible(&up->port.state->port.delta_msr_wait);
        }
        up->prev_status = status;
@@ -404,9 +404,9 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up,
                return;
        }
-        if (up->port.info == NULL)
+        if (up->port.state == NULL)
                goto ack_tx_int;
-        xmit = &up->port.info->xmit;
+        xmit = &up->port.state->xmit;
        if (uart_circ_empty(xmit))
                goto ack_tx_int;
        if (uart_tx_stopped(&up->port))
@@ -607,7 +607,7 @@ static void ip22zilog_start_tx(struct uart_port *port)
                port->icount.tx++;
                port->x_char = 0;
        } else {
-                struct circ_buf *xmit = &port->info->xmit;
+                struct circ_buf *xmit = &port->state->xmit;
                writeb(xmit->buf[xmit->tail], &channel->data);
                ZSDELAY();
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index 9dadaa11d266..b4b124e4828f 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -989,7 +989,7 @@ static void neo_param(struct jsm_channel *ch)
                        {     50, B50     },
                };
-                cflag = C_BAUD(ch->uart_port.info->port.tty);
+                cflag = C_BAUD(ch->uart_port.state->port.tty);
                baud = 9600;
                for (i = 0; i < ARRAY_SIZE(baud_rates); i++) {
                        if (baud_rates[i].cflag == cflag) {
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 00f4577d2f7f..7439c0373620 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -147,7 +147,7 @@ static void jsm_tty_send_xchar(struct uart_port *port, char ch)
        struct ktermios *termios;
        spin_lock_irqsave(&port->lock, lock_flags);
-        termios = port->info->port.tty->termios;
+        termios = port->state->port.tty->termios;
        if (ch == termios->c_cc[VSTART])
                channel->ch_bd->bd_ops->send_start_character(channel);
@@ -245,7 +245,7 @@ static int jsm_tty_open(struct uart_port *port)
        channel->ch_cached_lsr = 0;
        channel->ch_stops_sent = 0;
-        termios = port->info->port.tty->termios;
+        termios = port->state->port.tty->termios;
        channel->ch_c_cflag     = termios->c_cflag;
        channel->ch_c_iflag     = termios->c_iflag;
        channel->ch_c_oflag     = termios->c_oflag;
@@ -278,7 +278,7 @@ static void jsm_tty_close(struct uart_port *port)
        jsm_printk(CLOSE, INFO, &channel->ch_bd->pci_dev, "start\n");
        bd = channel->ch_bd;
-        ts = port->info->port.tty->termios;
+        ts = port->state->port.tty->termios;
        channel->ch_flags &= ~(CH_STOPI);
@@ -530,7 +530,7 @@ void jsm_input(struct jsm_channel *ch)
        if (!ch)
                return;
-        tp = ch->uart_port.info->port.tty;
+        tp = ch->uart_port.state->port.tty;
        bd = ch->ch_bd;
        if(!bd)
@@ -849,7 +849,7 @@ int jsm_tty_write(struct uart_port *port)
        u16 tail;
        u16 tmask;
        u32 remain;
-        int temp_tail = port->info->xmit.tail;
+        int temp_tail = port->state->xmit.tail;
        struct jsm_channel *channel = (struct jsm_channel *)port;
        tmask = WQUEUEMASK;
@@ -865,10 +865,10 @@ int jsm_tty_write(struct uart_port *port)
        data_count = 0;
        if (bufcount >= remain) {
                bufcount -= remain;
-                while ((port->info->xmit.head != temp_tail) &&
+                while ((port->state->xmit.head != temp_tail) &&
                (data_count < remain)) {
                        channel->ch_wqueue[head++] =
-                        port->info->xmit.buf[temp_tail];
+                        port->state->xmit.buf[temp_tail];
                        temp_tail++;
                        temp_tail &= (UART_XMIT_SIZE - 1);
@@ -880,10 +880,10 @@ int jsm_tty_write(struct uart_port *port)
        data_count1 = 0;
        if (bufcount > 0) {
                remain = bufcount;
-                while ((port->info->xmit.head != temp_tail) &&
+                while ((port->state->xmit.head != temp_tail) &&
                        (data_count1 < remain)) {
                        channel->ch_wqueue[head++] =
-                                port->info->xmit.buf[temp_tail];
+                                port->state->xmit.buf[temp_tail];
                        temp_tail++;
                        temp_tail &= (UART_XMIT_SIZE - 1);
@@ -892,7 +892,7 @@ int jsm_tty_write(struct uart_port *port)
                }
        }
-        port->info->xmit.tail = temp_tail;
+        port->state->xmit.tail = temp_tail;
        data_count += data_count1;
        if (data_count) {
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index 611c97a15654..bea5c215460c 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -286,7 +286,7 @@ static void m32r_sio_start_tx(struct uart_port *port)
 {
 #ifdef CONFIG_SERIAL_M32R_PLDSIO
        struct uart_sio_port *up = (struct uart_sio_port *)port;
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        if (!(up->ier & UART_IER_THRI)) {
                up->ier |= UART_IER_THRI;
@@ -325,7 +325,7 @@ static void m32r_sio_enable_ms(struct uart_port *port)
 static void receive_chars(struct uart_sio_port *up, int *status)
 {
-        struct tty_struct *tty = up->port.info->port.tty;
+        struct tty_struct *tty = up->port.state->port.tty;
        unsigned char ch;
        unsigned char flag;
        int max_count = 256;
@@ -398,7 +398,7 @@ static void receive_chars(struct uart_sio_port *up, int *status)
 static void transmit_chars(struct uart_sio_port *up)
 {
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        int count;
        if (up->port.x_char) {
diff --git a/drivers/serial/max3100.c b/drivers/serial/max3100.c
index 9fd33e5622bd..3c30c56aa2e1 100644
--- a/drivers/serial/max3100.c
+++ b/drivers/serial/max3100.c
@@ -184,7 +184,7 @@ static void max3100_timeout(unsigned long data)
 {
        struct max3100_port *s = (struct max3100_port *)data;
-        if (s->port.info) {
+        if (s->port.state) {
                max3100_dowork(s);
                mod_timer(&s->timer, jiffies + s->poll_time);
        }
@@ -261,7 +261,7 @@ static void max3100_work(struct work_struct *w)
        int rxchars;
        u16 tx, rx;
        int conf, cconf, rts, crts;
-        struct circ_buf *xmit = &s->port.info->xmit;
+        struct circ_buf *xmit = &s->port.state->xmit;
        dev_dbg(&s->spi->dev, "%s\n", __func__);
@@ -307,8 +307,8 @@ static void max3100_work(struct work_struct *w)
                        }
                }
-                if (rxchars > 16 && s->port.info->port.tty != NULL) {
+                if (rxchars > 16 && s->port.state->port.tty != NULL) {
-                        tty_flip_buffer_push(s->port.info->port.tty);
+                        tty_flip_buffer_push(s->port.state->port.tty);
                        rxchars = 0;
                }
                if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
@@ -320,8 +320,8 @@ static void max3100_work(struct work_struct *w)
                  (!uart_circ_empty(xmit) &&
                   !uart_tx_stopped(&s->port))));
-        if (rxchars > 0 && s->port.info->port.tty != NULL)
+        if (rxchars > 0 && s->port.state->port.tty != NULL)
-                tty_flip_buffer_push(s->port.info->port.tty);
+                tty_flip_buffer_push(s->port.state->port.tty);
 }
 static irqreturn_t max3100_irq(int irqno, void *dev_id)
@@ -429,7 +429,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
        int baud = 0;
        unsigned cflag;
        u32 param_new, param_mask, parity = 0;
-        struct tty_struct *tty = s->port.info->port.tty;
+        struct tty_struct *tty = s->port.state->port.tty;
        dev_dbg(&s->spi->dev, "%s\n", __func__);
        if (!tty)
@@ -529,7 +529,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
                        MAX3100_STATUS_OE;
        /* we are sending char from a workqueue so enable */
-        s->port.info->port.tty->low_latency = 1;
+        s->port.state->port.tty->low_latency = 1;
        if (s->poll_time > 0)
                del_timer_sync(&s->timer);
@@ -925,3 +925,4 @@ module_exit(max3100_exit);
 MODULE_DESCRIPTION("MAX3100 driver");
 MODULE_AUTHOR("Christian Pellegrin <chripell@evolware.org>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:max3100");
diff --git a/drivers/serial/mcf.c b/drivers/serial/mcf.c
index 0eefb07bebaf..b44382442bf1 100644
--- a/drivers/serial/mcf.c
+++ b/drivers/serial/mcf.c
@@ -323,7 +323,7 @@ static void mcf_rx_chars(struct mcf_uart *pp)
                uart_insert_char(port, status, MCFUART_USR_RXOVERRUN, ch, flag);
        }
-        tty_flip_buffer_push(port->info->port.tty);
+        tty_flip_buffer_push(port->state->port.tty);
 }
 /****************************************************************************/
@@ -331,7 +331,7 @@ static void mcf_rx_chars(struct mcf_uart *pp)
 static void mcf_tx_chars(struct mcf_uart *pp)
 {
        struct uart_port *port = &pp->port;
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        if (port->x_char) {
                /* Send special char - probably flow control */
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index abbd146c50d9..d7bcd074d383 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -745,7 +745,7 @@ static struct uart_ops mpc52xx_uart_ops = {
 static inline int
 mpc52xx_uart_int_rx_chars(struct uart_port *port)
 {
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        unsigned char ch, flag;
        unsigned short status;
@@ -812,7 +812,7 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port)
 static inline int
 mpc52xx_uart_int_tx_chars(struct uart_port *port)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        /* Process out of band chars */
        if (port->x_char) {
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index 61d3ade5286c..b5496c28e60b 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -936,7 +936,7 @@ static int serial_polled;
 static int mpsc_rx_intr(struct mpsc_port_info *pi)
 {
        struct mpsc_rx_desc *rxre;
-        struct tty_struct *tty = pi->port.info->port.tty;
+        struct tty_struct *tty = pi->port.state->port.tty;
        u32     cmdstat, bytes_in, i;
        int     rc = 0;
        u8      *bp;
@@ -1109,7 +1109,7 @@ static void mpsc_setup_tx_desc(struct mpsc_port_info *pi, u32 count, u32 intr)
 static void mpsc_copy_tx_data(struct mpsc_port_info *pi)
 {
-        struct circ_buf *xmit = &pi->port.info->xmit;
+        struct circ_buf *xmit = &pi->port.state->xmit;
        u8 *bp;
        u32 i;
diff --git a/drivers/serial/msm_serial.c b/drivers/serial/msm_serial.c
index f7c24baa1416..b05c5aa02cb4 100644
--- a/drivers/serial/msm_serial.c
+++ b/drivers/serial/msm_serial.c
@@ -88,7 +88,7 @@ static void msm_enable_ms(struct uart_port *port)
 static void handle_rx(struct uart_port *port)
 {
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        unsigned int sr;
        /*
@@ -136,7 +136,7 @@ static void handle_rx(struct uart_port *port)
 static void handle_tx(struct uart_port *port)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        struct msm_port *msm_port = UART_TO_MSM(port);
        int sent_tx;
@@ -169,7 +169,7 @@ static void handle_delta_cts(struct uart_port *port)
 {
        msm_write(port, UART_CR_CMD_RESET_CTS, UART_CR);
        port->icount.cts++;
-        wake_up_interruptible(&port->info->delta_msr_wait);
+        wake_up_interruptible(&port->state->port.delta_msr_wait);
 }
 static irqreturn_t msm_irq(int irq, void *dev_id)
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index 953a5ffa9b44..7571aaa138b0 100644
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -199,7 +199,7 @@ static void mux_break_ctl(struct uart_port *port, int break_state)
 static void mux_write(struct uart_port *port)
 {
        int count;
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        if(port->x_char) {
                UART_PUT_CHAR(port, port->x_char);
@@ -243,7 +243,7 @@ static void mux_write(struct uart_port *port)
 static void mux_read(struct uart_port *port)
 {
        int data;
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        __u32 start_count = port->icount.rx;
        while(1) {
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c
index 3e5dda8518b7..7735c9f35fa0 100644
--- a/drivers/serial/netx-serial.c
+++ b/drivers/serial/netx-serial.c
@@ -140,7 +140,7 @@ static void netx_enable_ms(struct uart_port *port)
 static inline void netx_transmit_buffer(struct uart_port *port)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        if (port->x_char) {
                writel(port->x_char, port->membase + UART_DR);
@@ -185,7 +185,7 @@ static unsigned int netx_tx_empty(struct uart_port *port)
 static void netx_txint(struct uart_port *port)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
                netx_stop_tx(port);
@@ -201,7 +201,7 @@ static void netx_txint(struct uart_port *port)
 static void netx_rxint(struct uart_port *port)
 {
        unsigned char rx, flg, status;
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        while (!(readl(port->membase + UART_FR) & FR_RXFE)) {
                rx = readl(port->membase + UART_DR);
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c
index 9e150b19d726..e1ab8ec0a4a6 100644
--- a/drivers/serial/nwpserial.c
+++ b/drivers/serial/nwpserial.c
@@ -126,7 +126,7 @@ static void nwpserial_config_port(struct uart_port *port, int flags)
 static irqreturn_t nwpserial_interrupt(int irq, void *dev_id)
 {
        struct nwpserial_port *up = dev_id;
-        struct tty_struct *tty = up->port.info->port.tty;
+        struct tty_struct *tty = up->port.state->port.tty;
        irqreturn_t ret;
        unsigned int iir;
        unsigned char ch;
@@ -261,7 +261,7 @@ static void nwpserial_start_tx(struct uart_port *port)
        struct nwpserial_port *up;
        struct circ_buf *xmit;
        up = container_of(port, struct nwpserial_port, port);
-        xmit  = &up->port.info->xmit;
+        xmit  = &up->port.state->xmit;
        if (port->x_char) {
                nwpserial_putchar(up, up->port.x_char);
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 9c1243fbd512..0700cd10b97c 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -242,12 +242,12 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
        }
        /* Sanity check, make sure the old bug is no longer happening */
-        if (uap->port.info == NULL || uap->port.info->port.tty == NULL) {
+        if (uap->port.state == NULL || uap->port.state->port.tty == NULL) {
                WARN_ON(1);
                (void)read_zsdata(uap);
                return NULL;
        }
-        tty = uap->port.info->port.tty;
+        tty = uap->port.state->port.tty;
        while (1) {
                error = 0;
@@ -369,7 +369,7 @@ static void pmz_status_handle(struct uart_pmac_port *uap)
                        uart_handle_cts_change(&uap->port,
                                               !(status & CTS));
-                wake_up_interruptible(&uap->port.info->delta_msr_wait);
+                wake_up_interruptible(&uap->port.state->port.delta_msr_wait);
        }
        if (status & BRK_ABRT)
@@ -420,9 +420,9 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap)
                return;
        }
-        if (uap->port.info == NULL)
+        if (uap->port.state == NULL)
                goto ack_tx_int;
-        xmit = &uap->port.info->xmit;
+        xmit = &uap->port.state->xmit;
        if (uart_circ_empty(xmit)) {
                uart_write_wakeup(&uap->port);
                goto ack_tx_int;
@@ -655,7 +655,7 @@ static void pmz_start_tx(struct uart_port *port)
                port->icount.tx++;
                port->x_char = 0;
        } else {
-                struct circ_buf *xmit = &port->info->xmit;
+                struct circ_buf *xmit = &port->state->xmit;
                write_zsdata(uap, xmit->buf[xmit->tail]);
                zssync(uap);
@@ -1645,7 +1645,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
        state = pmz_uart_reg.state + uap->port.line;
        mutex_lock(&pmz_irq_mutex);
-        mutex_lock(&state->mutex);
+        mutex_lock(&state->port.mutex);
        spin_lock_irqsave(&uap->port.lock, flags);
@@ -1676,7 +1676,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state)
        /* Shut the chip down */
        pmz_set_scc_power(uap, 0);
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&state->port.mutex);
        mutex_unlock(&pmz_irq_mutex);
        pmz_debug("suspend, switching complete\n");
@@ -1705,7 +1705,7 @@ static int pmz_resume(struct macio_dev *mdev)
        state = pmz_uart_reg.state + uap->port.line;
        mutex_lock(&pmz_irq_mutex);
-        mutex_lock(&state->mutex);
+        mutex_lock(&state->port.mutex);
        spin_lock_irqsave(&uap->port.lock, flags);
        if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) {
@@ -1737,7 +1737,7 @@ static int pmz_resume(struct macio_dev *mdev)
        }
 bail:
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&state->port.mutex);
        mutex_unlock(&pmz_irq_mutex);
        /* Right now, we deal with delay by blocking here, I'll be
diff --git a/drivers/serial/pnx8xxx_uart.c b/drivers/serial/pnx8xxx_uart.c
index 1bb8f1b45767..0aa75a97531c 100644
--- a/drivers/serial/pnx8xxx_uart.c
+++ b/drivers/serial/pnx8xxx_uart.c
@@ -100,7 +100,7 @@ static void pnx8xxx_mctrl_check(struct pnx8xxx_port *sport)
        if (changed & TIOCM_CTS)
                uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
-        wake_up_interruptible(&sport->port.info->delta_msr_wait);
+        wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
 }
 /*
@@ -112,7 +112,7 @@ static void pnx8xxx_timeout(unsigned long data)
        struct pnx8xxx_port *sport = (struct pnx8xxx_port *)data;
        unsigned long flags;
-        if (sport->port.info) {
+        if (sport->port.state) {
                spin_lock_irqsave(&sport->port.lock, flags);
                pnx8xxx_mctrl_check(sport);
                spin_unlock_irqrestore(&sport->port.lock, flags);
@@ -181,7 +181,7 @@ static void pnx8xxx_enable_ms(struct uart_port *port)
 static void pnx8xxx_rx_chars(struct pnx8xxx_port *sport)
 {
-        struct tty_struct *tty = sport->port.info->port.tty;
+        struct tty_struct *tty = sport->port.state->port.tty;
        unsigned int status, ch, flg;
        status = FIFO_TO_SM(serial_in(sport, PNX8XXX_FIFO)) |
@@ -243,7 +243,7 @@ static void pnx8xxx_rx_chars(struct pnx8xxx_port *sport)
 static void pnx8xxx_tx_chars(struct pnx8xxx_port *sport)
 {
-        struct circ_buf *xmit = &sport->port.info->xmit;
+        struct circ_buf *xmit = &sport->port.state->xmit;
        if (sport->port.x_char) {
                serial_out(sport, PNX8XXX_FIFO, sport->port.x_char);
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 514971fb5bff..b8629d74f6a2 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -96,7 +96,7 @@ static void serial_pxa_stop_rx(struct uart_port *port)
 static inline void receive_chars(struct uart_pxa_port *up, int *status)
 {
-        struct tty_struct *tty = up->port.info->port.tty;
+        struct tty_struct *tty = up->port.state->port.tty;
        unsigned int ch, flag;
        int max_count = 256;
@@ -161,7 +161,7 @@ static inline void receive_chars(struct uart_pxa_port *up, int *status)
 static void transmit_chars(struct uart_pxa_port *up)
 {
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        int count;
        if (up->port.x_char) {
@@ -220,7 +220,7 @@ static inline void check_modem_status(struct uart_pxa_port *up)
        if (status & UART_MSR_DCTS)
                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
-        wake_up_interruptible(&up->port.info->delta_msr_wait);
+        wake_up_interruptible(&up->port.state->port.delta_msr_wait);
 }
 /*
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 94530f01521e..7f5e26873220 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -117,7 +117,7 @@ static void sa1100_mctrl_check(struct sa1100_port *sport)
        if (changed & TIOCM_CTS)
                uart_handle_cts_change(&sport->port, status & TIOCM_CTS);
-        wake_up_interruptible(&sport->port.info->delta_msr_wait);
+        wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
 }
 /*
@@ -129,7 +129,7 @@ static void sa1100_timeout(unsigned long data)
        struct sa1100_port *sport = (struct sa1100_port *)data;
        unsigned long flags;
-        if (sport->port.info) {
+        if (sport->port.state) {
                spin_lock_irqsave(&sport->port.lock, flags);
                sa1100_mctrl_check(sport);
                spin_unlock_irqrestore(&sport->port.lock, flags);
@@ -189,7 +189,7 @@ static void sa1100_enable_ms(struct uart_port *port)
 static void
 sa1100_rx_chars(struct sa1100_port *sport)
 {
-        struct tty_struct *tty = sport->port.info->port.tty;
+        struct tty_struct *tty = sport->port.state->port.tty;
        unsigned int status, ch, flg;
        status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
@@ -239,7 +239,7 @@ sa1100_rx_chars(struct sa1100_port *sport)
 static void sa1100_tx_chars(struct sa1100_port *sport)
 {
-        struct circ_buf *xmit = &sport->port.info->xmit;
+        struct circ_buf *xmit = &sport->port.state->xmit;
        if (sport->port.x_char) {
                UART_PUT_CHAR(sport, sport->port.x_char);
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index c8851a0db63a..1523e8d9ae77 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -196,7 +196,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
 {
        struct s3c24xx_uart_port *ourport = dev_id;
        struct uart_port *port = &ourport->port;
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        unsigned int ufcon, ch, flag, ufstat, uerstat;
        int max_count = 64;
@@ -281,7 +281,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
 {
        struct s3c24xx_uart_port *ourport = id;
        struct uart_port *port = &ourport->port;
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        int count = 256;
        if (port->x_char) {
@@ -992,10 +992,10 @@ static int s3c24xx_serial_cpufreq_transition(struct notifier_block *nb,
                struct ktermios *termios;
                struct tty_struct *tty;
-                if (uport->info == NULL)
+                if (uport->state == NULL)
                        goto exit;
-                tty = uport->info->port.tty;
+                tty = uport->state->port.tty;
                if (tty == NULL)
                        goto exit;
diff --git a/drivers/serial/sb1250-duart.c b/drivers/serial/sb1250-duart.c
index 319e8b83f6be..a2f2b3254499 100644
--- a/drivers/serial/sb1250-duart.c
+++ b/drivers/serial/sb1250-duart.c
@@ -384,13 +384,13 @@ static void sbd_receive_chars(struct sbd_port *sport)
                uart_insert_char(uport, status, M_DUART_OVRUN_ERR, ch, flag);
        }
-        tty_flip_buffer_push(uport->info->port.tty);
+        tty_flip_buffer_push(uport->state->port.tty);
 }
 static void sbd_transmit_chars(struct sbd_port *sport)
 {
        struct uart_port *uport = &sport->port;
-        struct circ_buf *xmit = &sport->port.info->xmit;
+        struct circ_buf *xmit = &sport->port.state->xmit;
        unsigned int mask;
        int stop_tx;
@@ -440,7 +440,7 @@ static void sbd_status_handle(struct sbd_port *sport)
        if (delta & ((M_DUART_IN_PIN2_VAL | M_DUART_IN_PIN0_VAL) <<
                     S_DUART_IN_PIN_CHNG))
-                wake_up_interruptible(&uport->info->delta_msr_wait);
+                wake_up_interruptible(&uport->state->port.delta_msr_wait);
 }
 static irqreturn_t sbd_interrupt(int irq, void *dev_id)
diff --git a/drivers/serial/sc26xx.c b/drivers/serial/sc26xx.c
index e0be11ceaa25..75038ad2b242 100644
--- a/drivers/serial/sc26xx.c
+++ b/drivers/serial/sc26xx.c
@@ -140,8 +140,8 @@ static struct tty_struct *receive_chars(struct uart_port *port)
        char flag;
        u8 status;
-        if (port->info != NULL)         /* Unopened serial console */
+        if (port->state != NULL)                /* Unopened serial console */
-                tty = port->info->port.tty;
+                tty = port->state->port.tty;
        while (limit-- > 0) {
                status = READ_SC_PORT(port, SR);
@@ -190,10 +190,10 @@ static void transmit_chars(struct uart_port *port)
 {
        struct circ_buf *xmit;
-        if (!port->info)
+        if (!port->state)
                return;
-        xmit = &port->info->xmit;
+        xmit = &port->state->xmit;
        if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
                sc26xx_disable_irq(port, IMR_TXRDY);
                return;
@@ -316,7 +316,7 @@ static void sc26xx_stop_tx(struct uart_port *port)
 /* port->lock held by caller.  */
 static void sc26xx_start_tx(struct uart_port *port)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        while (!uart_circ_empty(xmit)) {
                if (!(READ_SC_PORT(port, SR) & SR_TXRDY)) {
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index b0bb29d804ae..1689bda1d13b 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -29,10 +29,10 @@
 #include <linux/console.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <linux/serial_core.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
 #include <linux/serial.h> /* for serial_state and serial_icounter_struct */
+#include <linux/serial_core.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
@@ -52,8 +52,6 @@ static struct lock_class_key port_lock_key;
 #define HIGH_BITS_OFFSET        ((sizeof(long)-sizeof(int))*8)
-#define uart_users(state)       ((state)->count + (state)->info.port.blocked_open)
 #ifdef CONFIG_SERIAL_CORE_CONSOLE
 #define uart_console(port)      ((port)->cons && (port)->cons->index == (port)->line)
 #else
@@ -71,19 +69,19 @@ static void uart_change_pm(struct uart_state *state, int pm_state);
 */
 void uart_write_wakeup(struct uart_port *port)
 {
-        struct uart_info *info = port->info;
+        struct uart_state *state = port->state;
        /*
         * This means you called this function _after_ the port was
         * closed.  No cookie for you.
         */
-        BUG_ON(!info);
+        BUG_ON(!state);
-        tasklet_schedule(&info->tlet);
+        tasklet_schedule(&state->tlet);
 }
 static void uart_stop(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct uart_port *port = state->uart_port;
        unsigned long flags;
        spin_lock_irqsave(&port->lock, flags);
@@ -94,9 +92,9 @@ static void uart_stop(struct tty_struct *tty)
 static void __uart_start(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct uart_port *port = state->uart_port;
-        if (!uart_circ_empty(&state->info.xmit) && state->info.xmit.buf &&
+        if (!uart_circ_empty(&state->xmit) && state->xmit.buf &&
            !tty->stopped && !tty->hw_stopped)
                port->ops->start_tx(port);
 }
@@ -104,7 +102,7 @@ static void __uart_start(struct tty_struct *tty)
 static void uart_start(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct uart_port *port = state->uart_port;
        unsigned long flags;
        spin_lock_irqsave(&port->lock, flags);
@@ -115,7 +113,7 @@ static void uart_start(struct tty_struct *tty)
 static void uart_tasklet_action(unsigned long data)
 {
        struct uart_state *state = (struct uart_state *)data;
-        tty_wakeup(state->info.port.tty);
+        tty_wakeup(state->port.tty);
 }
 static inline void
@@ -141,12 +139,12 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
 */
 static int uart_startup(struct uart_state *state, int init_hw)
 {
-        struct uart_info *info = &state->info;
+        struct uart_port *uport = state->uart_port;
-        struct uart_port *port = state->port;
+        struct tty_port *port = &state->port;
        unsigned long page;
        int retval = 0;
-        if (info->flags & UIF_INITIALIZED)
+        if (port->flags & ASYNC_INITIALIZED)
                return 0;
        /*
@@ -154,26 +152,26 @@ static int uart_startup(struct uart_state *state, int init_hw)
         * once we have successfully opened the port.  Also set
         * up the tty->alt_speed kludge
         */
-        set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+        set_bit(TTY_IO_ERROR, &port->tty->flags);
-        if (port->type == PORT_UNKNOWN)
+        if (uport->type == PORT_UNKNOWN)
                return 0;
        /*
         * Initialise and allocate the transmit and temporary
         * buffer.
         */
-        if (!info->xmit.buf) {
+        if (!state->xmit.buf) {
                /* This is protected by the per port mutex */
                page = get_zeroed_page(GFP_KERNEL);
                if (!page)
                        return -ENOMEM;
-                info->xmit.buf = (unsigned char *) page;
+                state->xmit.buf = (unsigned char *) page;
-                uart_circ_clear(&info->xmit);
+                uart_circ_clear(&state->xmit);
        }
-        retval = port->ops->startup(port);
+        retval = uport->ops->startup(uport);
        if (retval == 0) {
                if (init_hw) {
                        /*
@@ -185,20 +183,20 @@ static int uart_startup(struct uart_state *state, int init_hw)
                         * Setup the RTS and DTR signals once the
                         * port is open and ready to respond.
                         */
-                        if (info->port.tty->termios->c_cflag & CBAUD)
+                        if (port->tty->termios->c_cflag & CBAUD)
-                                uart_set_mctrl(port, TIOCM_RTS | TIOCM_DTR);
+                                uart_set_mctrl(uport, TIOCM_RTS | TIOCM_DTR);
                }
-                if (info->flags & UIF_CTS_FLOW) {
+                if (port->flags & ASYNC_CTS_FLOW) {
-                        spin_lock_irq(&port->lock);
+                        spin_lock_irq(&uport->lock);
-                        if (!(port->ops->get_mctrl(port) & TIOCM_CTS))
+                        if (!(uport->ops->get_mctrl(uport) & TIOCM_CTS))
-                                info->port.tty->hw_stopped = 1;
+                                port->tty->hw_stopped = 1;
-                        spin_unlock_irq(&port->lock);
+                        spin_unlock_irq(&uport->lock);
                }
-                info->flags |= UIF_INITIALIZED;
+                set_bit(ASYNCB_INITIALIZED, &port->flags);
-                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
+                clear_bit(TTY_IO_ERROR, &port->tty->flags);
        }
        if (retval && capable(CAP_SYS_ADMIN))
@@ -214,9 +212,9 @@ static int uart_startup(struct uart_state *state, int init_hw)
 */
 static void uart_shutdown(struct uart_state *state)
 {
-        struct uart_info *info = &state->info;
+        struct uart_port *uport = state->uart_port;
-        struct uart_port *port = state->port;
+        struct tty_port *port = &state->port;
-        struct tty_struct *tty = info->port.tty;
+        struct tty_struct *tty = port->tty;
        /*
         * Set the TTY IO error marker
@@ -224,14 +222,12 @@ static void uart_shutdown(struct uart_state *state)
        if (tty)
                set_bit(TTY_IO_ERROR, &tty->flags);
-        if (info->flags & UIF_INITIALIZED) {
+        if (test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) {
-                info->flags &= ~UIF_INITIALIZED;
                /*
                 * Turn off DTR and RTS early.
                 */
                if (!tty || (tty->termios->c_cflag & HUPCL))
-                        uart_clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
+                        uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
                /*
                 * clear delta_msr_wait queue to avoid mem leaks: we may free
@@ -240,30 +236,30 @@ static void uart_shutdown(struct uart_state *state)
                 * any outstanding file descriptors should be pointing at
                 * hung_up_tty_fops now.
                 */
-                wake_up_interruptible(&info->delta_msr_wait);
+                wake_up_interruptible(&port->delta_msr_wait);
                /*
                 * Free the IRQ and disable the port.
                 */
-                port->ops->shutdown(port);
+                uport->ops->shutdown(uport);
                /*
                 * Ensure that the IRQ handler isn't running on another CPU.
                 */
-                synchronize_irq(port->irq);
+                synchronize_irq(uport->irq);
        }
        /*
         * kill off our tasklet
         */
-        tasklet_kill(&info->tlet);
+        tasklet_kill(&state->tlet);
        /*
         * Free the transmit buffer page.
         */
-        if (info->xmit.buf) {
+        if (state->xmit.buf) {
-                free_page((unsigned long)info->xmit.buf);
+                free_page((unsigned long)state->xmit.buf);
-                info->xmit.buf = NULL;
+                state->xmit.buf = NULL;
        }
 }
@@ -430,15 +426,16 @@ EXPORT_SYMBOL(uart_get_divisor);
 static void
 uart_change_speed(struct uart_state *state, struct ktermios *old_termios)
 {
-        struct tty_struct *tty = state->info.port.tty;
+        struct tty_port *port = &state->port;
-        struct uart_port *port = state->port;
+        struct tty_struct *tty = port->tty;
+        struct uart_port *uport = state->uart_port;
        struct ktermios *termios;
        /*
         * If we have no tty, termios, or the port does not exist,
         * then we can't set the parameters for this port.
         */
-        if (!tty || !tty->termios || port->type == PORT_UNKNOWN)
+        if (!tty || !tty->termios || uport->type == PORT_UNKNOWN)
                return;
        termios = tty->termios;
@@ -447,16 +444,16 @@ uart_change_speed(struct uart_state *state, struct ktermios *old_termios)
         * Set flags based on termios cflag
         */
        if (termios->c_cflag & CRTSCTS)
-                state->info.flags |= UIF_CTS_FLOW;
+                set_bit(ASYNCB_CTS_FLOW, &port->flags);
        else
-                state->info.flags &= ~UIF_CTS_FLOW;
+                clear_bit(ASYNCB_CTS_FLOW, &port->flags);
        if (termios->c_cflag & CLOCAL)
-                state->info.flags &= ~UIF_CHECK_CD;
+                clear_bit(ASYNCB_CHECK_CD, &port->flags);
        else
-                state->info.flags |= UIF_CHECK_CD;
+                set_bit(ASYNCB_CHECK_CD, &port->flags);
-        port->ops->set_termios(port, termios, old_termios);
+        uport->ops->set_termios(uport, termios, old_termios);
 }
 static inline int
@@ -482,7 +479,7 @@ static int uart_put_char(struct tty_struct *tty, unsigned char ch)
 {
        struct uart_state *state = tty->driver_data;
-        return __uart_put_char(state->port, &state->info.xmit, ch);
+        return __uart_put_char(state->uart_port, &state->xmit, ch);
 }
 static void uart_flush_chars(struct tty_struct *tty)
@@ -508,8 +505,8 @@ uart_write(struct tty_struct *tty, const unsigned char *buf, int count)
                return -EL3HLT;
        }
-        port = state->port;
+        port = state->uart_port;
-        circ = &state->info.xmit;
+        circ = &state->xmit;
        if (!circ->buf)
                return 0;
@@ -539,9 +536,9 @@ static int uart_write_room(struct tty_struct *tty)
        unsigned long flags;
        int ret;
-        spin_lock_irqsave(&state->port->lock, flags);
+        spin_lock_irqsave(&state->uart_port->lock, flags);
-        ret = uart_circ_chars_free(&state->info.xmit);
+        ret = uart_circ_chars_free(&state->xmit);
-        spin_unlock_irqrestore(&state->port->lock, flags);
+        spin_unlock_irqrestore(&state->uart_port->lock, flags);
        return ret;
 }
@@ -551,9 +548,9 @@ static int uart_chars_in_buffer(struct tty_struct *tty)
        unsigned long flags;
        int ret;
-        spin_lock_irqsave(&state->port->lock, flags);
+        spin_lock_irqsave(&state->uart_port->lock, flags);
-        ret = uart_circ_chars_pending(&state->info.xmit);
+        ret = uart_circ_chars_pending(&state->xmit);
-        spin_unlock_irqrestore(&state->port->lock, flags);
+        spin_unlock_irqrestore(&state->uart_port->lock, flags);
        return ret;
 }
@@ -572,11 +569,11 @@ static void uart_flush_buffer(struct tty_struct *tty)
                return;
        }
-        port = state->port;
+        port = state->uart_port;
        pr_debug("uart_flush_buffer(%d) called\n", tty->index);
        spin_lock_irqsave(&port->lock, flags);
-        uart_circ_clear(&state->info.xmit);
+        uart_circ_clear(&state->xmit);
        if (port->ops->flush_buffer)
                port->ops->flush_buffer(port);
        spin_unlock_irqrestore(&port->lock, flags);
@@ -590,7 +587,7 @@ static void uart_flush_buffer(struct tty_struct *tty)
 static void uart_send_xchar(struct tty_struct *tty, char ch)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct uart_port *port = state->uart_port;
        unsigned long flags;
        if (port->ops->send_xchar)
@@ -613,13 +610,13 @@ static void uart_throttle(struct tty_struct *tty)
                uart_send_xchar(tty, STOP_CHAR(tty));
        if (tty->termios->c_cflag & CRTSCTS)
-                uart_clear_mctrl(state->port, TIOCM_RTS);
+                uart_clear_mctrl(state->uart_port, TIOCM_RTS);
 }
 static void uart_unthrottle(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct uart_port *port = state->uart_port;
        if (I_IXOFF(tty)) {
                if (port->x_char)
@@ -635,35 +632,36 @@ static void uart_unthrottle(struct tty_struct *tty)
 static int uart_get_info(struct uart_state *state,
                         struct serial_struct __user *retinfo)
 {
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
+        struct tty_port *port = &state->port;
        struct serial_struct tmp;
        memset(&tmp, 0, sizeof(tmp));
        /* Ensure the state we copy is consistent and no hardware changes
           occur as we go */
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
-        tmp.type            = port->type;
+        tmp.type            = uport->type;
-        tmp.line            = port->line;
+        tmp.line            = uport->line;
-        tmp.port            = port->iobase;
+        tmp.port            = uport->iobase;
        if (HIGH_BITS_OFFSET)
-                tmp.port_high = (long) port->iobase >> HIGH_BITS_OFFSET;
+                tmp.port_high = (long) uport->iobase >> HIGH_BITS_OFFSET;
-        tmp.irq             = port->irq;
+        tmp.irq             = uport->irq;
-        tmp.flags           = port->flags;
+        tmp.flags           = uport->flags;
-        tmp.xmit_fifo_size  = port->fifosize;
+        tmp.xmit_fifo_size  = uport->fifosize;
-        tmp.baud_base       = port->uartclk / 16;
+        tmp.baud_base       = uport->uartclk / 16;
-        tmp.close_delay     = state->close_delay / 10;
+        tmp.close_delay     = port->close_delay / 10;
-        tmp.closing_wait    = state->closing_wait == USF_CLOSING_WAIT_NONE ?
+        tmp.closing_wait    = port->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
                                ASYNC_CLOSING_WAIT_NONE :
-                                state->closing_wait / 10;
+                                port->closing_wait / 10;
-        tmp.custom_divisor  = port->custom_divisor;
+        tmp.custom_divisor  = uport->custom_divisor;
-        tmp.hub6            = port->hub6;
+        tmp.hub6            = uport->hub6;
-        tmp.io_type         = port->iotype;
+        tmp.io_type         = uport->iotype;
-        tmp.iomem_reg_shift = port->regshift;
+        tmp.iomem_reg_shift = uport->regshift;
-        tmp.iomem_base      = (void *)(unsigned long)port->mapbase;
+        tmp.iomem_base      = (void *)(unsigned long)uport->mapbase;
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
                return -EFAULT;
@@ -674,7 +672,8 @@ static int uart_set_info(struct uart_state *state,
                         struct serial_struct __user *newinfo)
 {
        struct serial_struct new_serial;
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
+        struct tty_port *port = &state->port;
        unsigned long new_port;
        unsigned int change_irq, change_port, closing_wait;
        unsigned int old_custom_divisor, close_delay;
@@ -691,58 +690,58 @@ static int uart_set_info(struct uart_state *state,
        new_serial.irq = irq_canonicalize(new_serial.irq);
        close_delay = new_serial.close_delay * 10;
        closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
-                        USF_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
+                        ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
        /*
-         * This semaphore protects state->count.  It is also
+         * This semaphore protects port->count.  It is also
         * very useful to prevent opens.  Also, take the
         * port configuration semaphore to make sure that a
         * module insertion/removal doesn't change anything
         * under us.
         */
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
-        change_irq  = !(port->flags & UPF_FIXED_PORT)
+        change_irq  = !(uport->flags & UPF_FIXED_PORT)
-                && new_serial.irq != port->irq;
+                && new_serial.irq != uport->irq;
        /*
         * Since changing the 'type' of the port changes its resource
         * allocations, we should treat type changes the same as
         * IO port changes.
         */
-        change_port = !(port->flags & UPF_FIXED_PORT)
+        change_port = !(uport->flags & UPF_FIXED_PORT)
-                && (new_port != port->iobase ||
+                && (new_port != uport->iobase ||
-                    (unsigned long)new_serial.iomem_base != port->mapbase ||
+                    (unsigned long)new_serial.iomem_base != uport->mapbase ||
-                    new_serial.hub6 != port->hub6 ||
+                    new_serial.hub6 != uport->hub6 ||
-                    new_serial.io_type != port->iotype ||
+                    new_serial.io_type != uport->iotype ||
-                    new_serial.iomem_reg_shift != port->regshift ||
+                    new_serial.iomem_reg_shift != uport->regshift ||
-                    new_serial.type != port->type);
+                    new_serial.type != uport->type);
-        old_flags = port->flags;
+        old_flags = uport->flags;
        new_flags = new_serial.flags;
-        old_custom_divisor = port->custom_divisor;
+        old_custom_divisor = uport->custom_divisor;
        if (!capable(CAP_SYS_ADMIN)) {
                retval = -EPERM;
                if (change_irq || change_port ||
-                    (new_serial.baud_base != port->uartclk / 16) ||
+                    (new_serial.baud_base != uport->uartclk / 16) ||
-                    (close_delay != state->close_delay) ||
+                    (close_delay != port->close_delay) ||
-                    (closing_wait != state->closing_wait) ||
+                    (closing_wait != port->closing_wait) ||
                    (new_serial.xmit_fifo_size &&
-                     new_serial.xmit_fifo_size != port->fifosize) ||
+                     new_serial.xmit_fifo_size != uport->fifosize) ||
                    (((new_flags ^ old_flags) & ~UPF_USR_MASK) != 0))
                        goto exit;
-                port->flags = ((port->flags & ~UPF_USR_MASK) |
+                uport->flags = ((uport->flags & ~UPF_USR_MASK) |
                               (new_flags & UPF_USR_MASK));
-                port->custom_divisor = new_serial.custom_divisor;
+                uport->custom_divisor = new_serial.custom_divisor;
                goto check_and_exit;
        }
        /*
         * Ask the low level driver to verify the settings.
         */
-        if (port->ops->verify_port)
+        if (uport->ops->verify_port)
-                retval = port->ops->verify_port(port, &new_serial);
+                retval = uport->ops->verify_port(uport, &new_serial);
        if ((new_serial.irq >= nr_irqs) || (new_serial.irq < 0) ||
            (new_serial.baud_base < 9600))
@@ -757,7 +756,7 @@ static int uart_set_info(struct uart_state *state,
                /*
                 * Make sure that we are the sole user of this port.
                 */
-                if (uart_users(state) > 1)
+                if (tty_port_users(port) > 1)
                        goto exit;
                /*
@@ -771,31 +770,31 @@ static int uart_set_info(struct uart_state *state,
                unsigned long old_iobase, old_mapbase;
                unsigned int old_type, old_iotype, old_hub6, old_shift;
-                old_iobase = port->iobase;
+                old_iobase = uport->iobase;
-                old_mapbase = port->mapbase;
+                old_mapbase = uport->mapbase;
-                old_type = port->type;
+                old_type = uport->type;
-                old_hub6 = port->hub6;
+                old_hub6 = uport->hub6;
-                old_iotype = port->iotype;
+                old_iotype = uport->iotype;
-                old_shift = port->regshift;
+                old_shift = uport->regshift;
                /*
                 * Free and release old regions
                 */
                if (old_type != PORT_UNKNOWN)
-                        port->ops->release_port(port);
+                        uport->ops->release_port(uport);
-                port->iobase = new_port;
+                uport->iobase = new_port;
-                port->type = new_serial.type;
+                uport->type = new_serial.type;
-                port->hub6 = new_serial.hub6;
+                uport->hub6 = new_serial.hub6;
-                port->iotype = new_serial.io_type;
+                uport->iotype = new_serial.io_type;
-                port->regshift = new_serial.iomem_reg_shift;
+                uport->regshift = new_serial.iomem_reg_shift;
-                port->mapbase = (unsigned long)new_serial.iomem_base;
+                uport->mapbase = (unsigned long)new_serial.iomem_base;
                /*
                 * Claim and map the new regions
                 */
-                if (port->type != PORT_UNKNOWN) {
+                if (uport->type != PORT_UNKNOWN) {
-                        retval = port->ops->request_port(port);
+                        retval = uport->ops->request_port(uport);
                } else {
                        /* Always success - Jean II */
                        retval = 0;
@@ -806,19 +805,19 @@ static int uart_set_info(struct uart_state *state,
                 * new port, try to restore the old settings.
                 */
                if (retval && old_type != PORT_UNKNOWN) {
-                        port->iobase = old_iobase;
+                        uport->iobase = old_iobase;
-                        port->type = old_type;
+                        uport->type = old_type;
-                        port->hub6 = old_hub6;
+                        uport->hub6 = old_hub6;
-                        port->iotype = old_iotype;
+                        uport->iotype = old_iotype;
-                        port->regshift = old_shift;
+                        uport->regshift = old_shift;
-                        port->mapbase = old_mapbase;
+                        uport->mapbase = old_mapbase;
-                        retval = port->ops->request_port(port);
+                        retval = uport->ops->request_port(uport);
                        /*
                         * If we failed to restore the old settings,
                         * we fail like this.
                         */
                        if (retval)
-                                port->type = PORT_UNKNOWN;
+                                uport->type = PORT_UNKNOWN;
                        /*
                         * We failed anyway.
@@ -830,45 +829,45 @@ static int uart_set_info(struct uart_state *state,
        }
        if (change_irq)
-                port->irq      = new_serial.irq;
+                uport->irq      = new_serial.irq;
-        if (!(port->flags & UPF_FIXED_PORT))
+        if (!(uport->flags & UPF_FIXED_PORT))
-                port->uartclk  = new_serial.baud_base * 16;
+                uport->uartclk  = new_serial.baud_base * 16;
-        port->flags            = (port->flags & ~UPF_CHANGE_MASK) |
+        uport->flags            = (uport->flags & ~UPF_CHANGE_MASK) |
                                 (new_flags & UPF_CHANGE_MASK);
-        port->custom_divisor   = new_serial.custom_divisor;
+        uport->custom_divisor   = new_serial.custom_divisor;
-        state->close_delay     = close_delay;
+        port->close_delay     = close_delay;
-        state->closing_wait    = closing_wait;
+        port->closing_wait    = closing_wait;
        if (new_serial.xmit_fifo_size)
-                port->fifosize = new_serial.xmit_fifo_size;
+                uport->fifosize = new_serial.xmit_fifo_size;
-        if (state->info.port.tty)
+        if (port->tty)
-                state->info.port.tty->low_latency =
+                port->tty->low_latency =
-                        (port->flags & UPF_LOW_LATENCY) ? 1 : 0;
+                        (uport->flags & UPF_LOW_LATENCY) ? 1 : 0;
 check_and_exit:
        retval = 0;
-        if (port->type == PORT_UNKNOWN)
+        if (uport->type == PORT_UNKNOWN)
                goto exit;
-        if (state->info.flags & UIF_INITIALIZED) {
+        if (port->flags & ASYNC_INITIALIZED) {
-                if (((old_flags ^ port->flags) & UPF_SPD_MASK) ||
+                if (((old_flags ^ uport->flags) & UPF_SPD_MASK) ||
-                    old_custom_divisor != port->custom_divisor) {
+                    old_custom_divisor != uport->custom_divisor) {
                        /*
                         * If they're setting up a custom divisor or speed,
                         * instead of clearing it, then bitch about it. No
                         * need to rate-limit; it's CAP_SYS_ADMIN only.
                         */
-                        if (port->flags & UPF_SPD_MASK) {
+                        if (uport->flags & UPF_SPD_MASK) {
                                char buf[64];
                                printk(KERN_NOTICE
                                       "%s sets custom speed on %s. This "
                                       "is deprecated.\n", current->comm,
-                                       tty_name(state->info.port.tty, buf));
+                                       tty_name(port->tty, buf));
                        }
                        uart_change_speed(state, NULL);
                }
        } else
                retval = uart_startup(state, 1);
 exit:
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        return retval;
 }
@@ -880,10 +879,11 @@ static int uart_set_info(struct uart_state *state,
 static int uart_get_lsr_info(struct uart_state *state,
                             unsigned int __user *value)
 {
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
+        struct tty_port *port = &state->port;
        unsigned int result;
-        result = port->ops->tx_empty(port);
+        result = uport->ops->tx_empty(uport);
        /*
         * If we're about to load something into the transmit
@@ -891,9 +891,9 @@ static int uart_get_lsr_info(struct uart_state *state,
         * avoid a race condition (depending on when the transmit
         * interrupt happens).
         */
-        if (port->x_char ||
+        if (uport->x_char ||
-            ((uart_circ_chars_pending(&state->info.xmit) > 0) &&
+            ((uart_circ_chars_pending(&state->xmit) > 0) &&
-             !state->info.port.tty->stopped && !state->info.port.tty->hw_stopped))
+             !port->tty->stopped && !port->tty->hw_stopped))
                result &= ~TIOCSER_TEMT;
        return put_user(result, value);
@@ -902,19 +902,20 @@ static int uart_get_lsr_info(struct uart_state *state,
 static int uart_tiocmget(struct tty_struct *tty, struct file *file)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct tty_port *port = &state->port;
+        struct uart_port *uport = state->uart_port;
        int result = -EIO;
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
        if ((!file || !tty_hung_up_p(file)) &&
            !(tty->flags & (1 << TTY_IO_ERROR))) {
-                result = port->mctrl;
+                result = uport->mctrl;
-                spin_lock_irq(&port->lock);
+                spin_lock_irq(&uport->lock);
-                result |= port->ops->get_mctrl(port);
+                result |= uport->ops->get_mctrl(uport);
-                spin_unlock_irq(&port->lock);
+                spin_unlock_irq(&uport->lock);
        }
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        return result;
 }
@@ -924,36 +925,39 @@ uart_tiocmset(struct tty_struct *tty, struct file *file,
              unsigned int set, unsigned int clear)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
+        struct tty_port *port = &state->port;
        int ret = -EIO;
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
        if ((!file || !tty_hung_up_p(file)) &&
            !(tty->flags & (1 << TTY_IO_ERROR))) {
-                uart_update_mctrl(port, set, clear);
+                uart_update_mctrl(uport, set, clear);
                ret = 0;
        }
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        return ret;
 }
 static int uart_break_ctl(struct tty_struct *tty, int break_state)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct tty_port *port = &state->port;
+        struct uart_port *uport = state->uart_port;
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
-        if (port->type != PORT_UNKNOWN)
+        if (uport->type != PORT_UNKNOWN)
-                port->ops->break_ctl(port, break_state);
+                uport->ops->break_ctl(uport, break_state);
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        return 0;
 }
 static int uart_do_autoconfig(struct uart_state *state)
 {
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
+        struct tty_port *port = &state->port;
        int flags, ret;
        if (!capable(CAP_SYS_ADMIN))
@@ -964,33 +968,33 @@ static int uart_do_autoconfig(struct uart_state *state)
         * changing, and hence any extra opens of the port while
         * we're auto-configuring.
         */
-        if (mutex_lock_interruptible(&state->mutex))
+        if (mutex_lock_interruptible(&port->mutex))
                return -ERESTARTSYS;
        ret = -EBUSY;
-        if (uart_users(state) == 1) {
+        if (tty_port_users(port) == 1) {
                uart_shutdown(state);
                /*
                 * If we already have a port type configured,
                 * we must release its resources.
                 */
-                if (port->type != PORT_UNKNOWN)
+                if (uport->type != PORT_UNKNOWN)
-                        port->ops->release_port(port);
+                        uport->ops->release_port(uport);
                flags = UART_CONFIG_TYPE;
-                if (port->flags & UPF_AUTO_IRQ)
+                if (uport->flags & UPF_AUTO_IRQ)
                        flags |= UART_CONFIG_IRQ;
                /*
                 * This will claim the ports resources if
                 * a port is found.
                 */
-                port->ops->config_port(port, flags);
+                uport->ops->config_port(uport, flags);
                ret = uart_startup(state, 1);
        }
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        return ret;
 }
@@ -999,11 +1003,15 @@ static int uart_do_autoconfig(struct uart_state *state)
 * - mask passed in arg for lines of interest
 *   (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
 * Caller should use TIOCGICOUNT to see which one it was
+ *
+ * FIXME: This wants extracting into a common all driver implementation
+ * of TIOCMWAIT using tty_port.
 */
 static int
 uart_wait_modem_status(struct uart_state *state, unsigned long arg)
 {
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
+        struct tty_port *port = &state->port;
        DECLARE_WAITQUEUE(wait, current);
        struct uart_icount cprev, cnow;
        int ret;
@@ -1011,20 +1019,20 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)
        /*
         * note the counters on entry
         */
-        spin_lock_irq(&port->lock);
+        spin_lock_irq(&uport->lock);
-        memcpy(&cprev, &port->icount, sizeof(struct uart_icount));
+        memcpy(&cprev, &uport->icount, sizeof(struct uart_icount));
        /*
         * Force modem status interrupts on
         */
-        port->ops->enable_ms(port);
+        uport->ops->enable_ms(uport);
-        spin_unlock_irq(&port->lock);
+        spin_unlock_irq(&uport->lock);
-        add_wait_queue(&state->info.delta_msr_wait, &wait);
+        add_wait_queue(&port->delta_msr_wait, &wait);
        for (;;) {
-                spin_lock_irq(&port->lock);
+                spin_lock_irq(&uport->lock);
-                memcpy(&cnow, &port->icount, sizeof(struct uart_icount));
+                memcpy(&cnow, &uport->icount, sizeof(struct uart_icount));
-                spin_unlock_irq(&port->lock);
+                spin_unlock_irq(&uport->lock);
                set_current_state(TASK_INTERRUPTIBLE);
@@ -1048,7 +1056,7 @@ uart_wait_modem_status(struct uart_state *state, unsigned long arg)
        }
        current->state = TASK_RUNNING;
-        remove_wait_queue(&state->info.delta_msr_wait, &wait);
+        remove_wait_queue(&port->delta_msr_wait, &wait);
        return ret;
 }
@@ -1064,11 +1072,11 @@ static int uart_get_count(struct uart_state *state,
 {
        struct serial_icounter_struct icount;
        struct uart_icount cnow;
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
-        spin_lock_irq(&port->lock);
+        spin_lock_irq(&uport->lock);
-        memcpy(&cnow, &port->icount, sizeof(struct uart_icount));
+        memcpy(&cnow, &uport->icount, sizeof(struct uart_icount));
-        spin_unlock_irq(&port->lock);
+        spin_unlock_irq(&uport->lock);
        icount.cts         = cnow.cts;
        icount.dsr         = cnow.dsr;
@@ -1093,6 +1101,7 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
           unsigned long arg)
 {
        struct uart_state *state = tty->driver_data;
+        struct tty_port *port = &state->port;
        void __user *uarg = (void __user *)arg;
        int ret = -ENOIOCTLCMD;
@@ -1143,7 +1152,7 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
        if (ret != -ENOIOCTLCMD)
                goto out;
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
        if (tty_hung_up_p(filp)) {
                ret = -EIO;
@@ -1160,14 +1169,14 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd,
                break;
        default: {
-                struct uart_port *port = state->port;
+                struct uart_port *uport = state->uart_port;
-                if (port->ops->ioctl)
+                if (uport->ops->ioctl)
-                        ret = port->ops->ioctl(port, cmd, arg);
+                        ret = uport->ops->ioctl(uport, cmd, arg);
                break;
        }
        }
 out_up:
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
 out:
        return ret;
 }
@@ -1175,10 +1184,10 @@ out:
 static void uart_set_ldisc(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
-        if (port->ops->set_ldisc)
+        if (uport->ops->set_ldisc)
-                port->ops->set_ldisc(port);
+                uport->ops->set_ldisc(uport);
 }
 static void uart_set_termios(struct tty_struct *tty,
@@ -1207,7 +1216,7 @@ static void uart_set_termios(struct tty_struct *tty,
        /* Handle transition to B0 status */
        if ((old_termios->c_cflag & CBAUD) && !(cflag & CBAUD))
-                uart_clear_mctrl(state->port, TIOCM_RTS | TIOCM_DTR);
+                uart_clear_mctrl(state->uart_port, TIOCM_RTS | TIOCM_DTR);
        /* Handle transition away from B0 status */
        if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
@@ -1215,25 +1224,25 @@ static void uart_set_termios(struct tty_struct *tty,
                if (!(cflag & CRTSCTS) ||
                    !test_bit(TTY_THROTTLED, &tty->flags))
                        mask |= TIOCM_RTS;
-                uart_set_mctrl(state->port, mask);
+                uart_set_mctrl(state->uart_port, mask);
        }
        /* Handle turning off CRTSCTS */
        if ((old_termios->c_cflag & CRTSCTS) && !(cflag & CRTSCTS)) {
-                spin_lock_irqsave(&state->port->lock, flags);
+                spin_lock_irqsave(&state->uart_port->lock, flags);
                tty->hw_stopped = 0;
                __uart_start(tty);
-                spin_unlock_irqrestore(&state->port->lock, flags);
+                spin_unlock_irqrestore(&state->uart_port->lock, flags);
        }
        /* Handle turning on CRTSCTS */
        if (!(old_termios->c_cflag & CRTSCTS) && (cflag & CRTSCTS)) {
-                spin_lock_irqsave(&state->port->lock, flags);
+                spin_lock_irqsave(&state->uart_port->lock, flags);
-                if (!(state->port->ops->get_mctrl(state->port) & TIOCM_CTS)) {
+                if (!(state->uart_port->ops->get_mctrl(state->uart_port) & TIOCM_CTS)) {
                        tty->hw_stopped = 1;
-                        state->port->ops->stop_tx(state->port);
+                        state->uart_port->ops->stop_tx(state->uart_port);
                }
-                spin_unlock_irqrestore(&state->port->lock, flags);
+                spin_unlock_irqrestore(&state->uart_port->lock, flags);
        }
 #if 0
        /*
@@ -1244,7 +1253,7 @@ static void uart_set_termios(struct tty_struct *tty,
         */
        if (!(old_termios->c_cflag & CLOCAL) &&
            (tty->termios->c_cflag & CLOCAL))
-                wake_up_interruptible(&info->port.open_wait);
+                wake_up_interruptible(&state->uart_port.open_wait);
 #endif
 }
@@ -1256,40 +1265,39 @@ static void uart_set_termios(struct tty_struct *tty,
 static void uart_close(struct tty_struct *tty, struct file *filp)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port;
+        struct tty_port *port;
+        struct uart_port *uport;
        BUG_ON(!kernel_locked());
-        if (!state || !state->port)
+        uport = state->uart_port;
-                return;
+        port = &state->port;
-        port = state->port;
+        pr_debug("uart_close(%d) called\n", uport->line);
-        pr_debug("uart_close(%d) called\n", port->line);
+        mutex_lock(&port->mutex);
-        mutex_lock(&state->mutex);
        if (tty_hung_up_p(filp))
                goto done;
-        if ((tty->count == 1) && (state->count != 1)) {
+        if ((tty->count == 1) && (port->count != 1)) {
                /*
                 * Uh, oh.  tty->count is 1, which means that the tty
-                 * structure will be freed.  state->count should always
+                 * structure will be freed.  port->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(KERN_ERR "uart_close: bad serial port count; tty->count is 1, "
-                       "state->count is %d\n", state->count);
+                       "port->count is %d\n", port->count);
-                state->count = 1;
+                port->count = 1;
        }
-        if (--state->count < 0) {
+        if (--port->count < 0) {
                printk(KERN_ERR "uart_close: bad serial port count for %s: %d\n",
-                       tty->name, state->count);
+                       tty->name, port->count);
-                state->count = 0;
+                port->count = 0;
        }
-        if (state->count)
+        if (port->count)
                goto done;
        /*
@@ -1299,24 +1307,24 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
         */
        tty->closing = 1;
-        if (state->closing_wait != USF_CLOSING_WAIT_NONE)
+        if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent(tty, msecs_to_jiffies(state->closing_wait));
+                tty_wait_until_sent(tty, msecs_to_jiffies(port->closing_wait));
        /*
         * At this point, we stop accepting input.  To do this, we
         * disable the receive line status interrupts.
         */
-        if (state->info.flags & UIF_INITIALIZED) {
+        if (port->flags & ASYNC_INITIALIZED) {
                unsigned long flags;
                spin_lock_irqsave(&port->lock, flags);
-                port->ops->stop_rx(port);
+                uport->ops->stop_rx(uport);
                spin_unlock_irqrestore(&port->lock, flags);
                /*
                 * Before we drop DTR, make sure the UART transmitter
                 * has completely drained; this is especially
                 * important if there is a transmit FIFO!
                 */
-                uart_wait_until_sent(tty, port->timeout);
+                uart_wait_until_sent(tty, uport->timeout);
        }
        uart_shutdown(state);
@@ -1325,29 +1333,29 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
        tty_ldisc_flush(tty);
        tty->closing = 0;
-        state->info.port.tty = NULL;
+        tty_port_tty_set(port, NULL);
-        if (state->info.port.blocked_open) {
+        if (port->blocked_open) {
-                if (state->close_delay)
+                if (port->close_delay)
-                        msleep_interruptible(state->close_delay);
+                        msleep_interruptible(port->close_delay);
-        } else if (!uart_console(port)) {
+        } else if (!uart_console(uport)) {
                uart_change_pm(state, 3);
        }
        /*
         * Wake up anyone trying to open this port.
         */
-        state->info.flags &= ~UIF_NORMAL_ACTIVE;
+        clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
-        wake_up_interruptible(&state->info.port.open_wait);
+        wake_up_interruptible(&port->open_wait);
- done:
+done:
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
 }
 static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_port *port = state->port;
+        struct uart_port *port = state->uart_port;
        unsigned long char_time, expire;
        if (port->type == PORT_UNKNOWN || port->fifosize == 0)
@@ -1412,22 +1420,22 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
 static void uart_hangup(struct tty_struct *tty)
 {
        struct uart_state *state = tty->driver_data;
-        struct uart_info *info = &state->info;
+        struct tty_port *port = &state->port;
        BUG_ON(!kernel_locked());
-        pr_debug("uart_hangup(%d)\n", state->port->line);
+        pr_debug("uart_hangup(%d)\n", state->uart_port->line);
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
-        if (info->flags & UIF_NORMAL_ACTIVE) {
+        if (port->flags & ASYNC_NORMAL_ACTIVE) {
                uart_flush_buffer(tty);
                uart_shutdown(state);
-                state->count = 0;
+                port->count = 0;
-                info->flags &= ~UIF_NORMAL_ACTIVE;
+                clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
-                info->port.tty = NULL;
+                tty_port_tty_set(port, NULL);
-                wake_up_interruptible(&info->port.open_wait);
+                wake_up_interruptible(&port->open_wait);
-                wake_up_interruptible(&info->delta_msr_wait);
+                wake_up_interruptible(&port->delta_msr_wait);
        }
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
 }
 /*
@@ -1438,8 +1446,8 @@ static void uart_hangup(struct tty_struct *tty)
 */
 static void uart_update_termios(struct uart_state *state)
 {
-        struct tty_struct *tty = state->info.port.tty;
+        struct tty_struct *tty = state->port.tty;
-        struct uart_port *port = state->port;
+        struct uart_port *port = state->uart_port;
        if (uart_console(port) && port->cons->cflag) {
                tty->termios->c_cflag = port->cons->cflag;
@@ -1473,27 +1481,27 @@ static int
 uart_block_til_ready(struct file *filp, struct uart_state *state)
 {
        DECLARE_WAITQUEUE(wait, current);
-        struct uart_info *info = &state->info;
+        struct uart_port *uport = state->uart_port;
-        struct uart_port *port = state->port;
+        struct tty_port *port = &state->port;
        unsigned int mctrl;
-        info->port.blocked_open++;
+        port->blocked_open++;
-        state->count--;
+        port->count--;
-        add_wait_queue(&info->port.open_wait, &wait);
+        add_wait_queue(&port->open_wait, &wait);
        while (1) {
                set_current_state(TASK_INTERRUPTIBLE);
                /*
                 * If we have been hung up, tell userspace/restart open.
                 */
-                if (tty_hung_up_p(filp) || info->port.tty == NULL)
+                if (tty_hung_up_p(filp) || port->tty == NULL)
                        break;
                /*
                 * If the port has been closed, tell userspace/restart open.
                 */
-                if (!(info->flags & UIF_INITIALIZED))
+                if (!(port->flags & ASYNC_INITIALIZED))
                        break;
                /*
@@ -1506,8 +1514,8 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
                 * have set TTY_IO_ERROR for a non-existant port.
                 */
                if ((filp->f_flags & O_NONBLOCK) ||
-                    (info->port.tty->termios->c_cflag & CLOCAL) ||
+                    (port->tty->termios->c_cflag & CLOCAL) ||
-                    (info->port.tty->flags & (1 << TTY_IO_ERROR)))
+                    (port->tty->flags & (1 << TTY_IO_ERROR)))
                        break;
                /*
@@ -1515,37 +1523,37 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
                 * not set RTS here - we want to make sure we catch
                 * the data from the modem.
                 */
-                if (info->port.tty->termios->c_cflag & CBAUD)
+                if (port->tty->termios->c_cflag & CBAUD)
-                        uart_set_mctrl(port, TIOCM_DTR);
+                        uart_set_mctrl(uport, TIOCM_DTR);
                /*
                 * and wait for the carrier to indicate that the
                 * modem is ready for us.
                 */
-                spin_lock_irq(&port->lock);
+                spin_lock_irq(&uport->lock);
-                port->ops->enable_ms(port);
+                uport->ops->enable_ms(uport);
-                mctrl = port->ops->get_mctrl(port);
+                mctrl = uport->ops->get_mctrl(uport);
-                spin_unlock_irq(&port->lock);
+                spin_unlock_irq(&uport->lock);
                if (mctrl & TIOCM_CAR)
                        break;
-                mutex_unlock(&state->mutex);
+                mutex_unlock(&port->mutex);
                schedule();
-                mutex_lock(&state->mutex);
+                mutex_lock(&port->mutex);
                if (signal_pending(current))
                        break;
        }
        set_current_state(TASK_RUNNING);
-        remove_wait_queue(&info->port.open_wait, &wait);
+        remove_wait_queue(&port->open_wait, &wait);
-        state->count++;
+        port->count++;
-        info->port.blocked_open--;
+        port->blocked_open--;
        if (signal_pending(current))
                return -ERESTARTSYS;
-        if (!info->port.tty || tty_hung_up_p(filp))
+        if (!port->tty || tty_hung_up_p(filp))
                return -EAGAIN;
        return 0;
@@ -1554,24 +1562,26 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
 static struct uart_state *uart_get(struct uart_driver *drv, int line)
 {
        struct uart_state *state;
+        struct tty_port *port;
        int ret = 0;
        state = drv->state + line;
-        if (mutex_lock_interruptible(&state->mutex)) {
+        port = &state->port;
+        if (mutex_lock_interruptible(&port->mutex)) {
                ret = -ERESTARTSYS;
                goto err;
        }
-        state->count++;
+        port->count++;
-        if (!state->port || state->port->flags & UPF_DEAD) {
+        if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
                ret = -ENXIO;
                goto err_unlock;
        }
        return state;
 err_unlock:
-        state->count--;
+        port->count--;
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
 err:
        return ERR_PTR(ret);
 }
@@ -1590,6 +1600,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
 {
        struct uart_driver *drv = (struct uart_driver *)tty->driver->driver_state;
        struct uart_state *state;
+        struct tty_port *port;
        int retval, line = tty->index;
        BUG_ON(!kernel_locked());
@@ -1606,16 +1617,18 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
        /*
         * We take the semaphore inside uart_get to guarantee that we won't
-         * be re-entered while allocating the info structure, or while we
+         * be re-entered while allocating the state structure, or while we
         * request any IRQs that the driver may need.  This also has the nice
         * side-effect that it delays the action of uart_hangup, so we can
-         * guarantee that info->port.tty will always contain something reasonable.
+         * guarantee that state->port.tty will always contain something
+         * reasonable.
         */
        state = uart_get(drv, line);
        if (IS_ERR(state)) {
                retval = PTR_ERR(state);
                goto fail;
        }
+        port = &state->port;
        /*
         * Once we set tty->driver_data here, we are guaranteed that
@@ -1623,25 +1636,25 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         * Any failures from here onwards should not touch the count.
         */
        tty->driver_data = state;
-        state->port->info = &state->info;
+        state->uart_port->state = state;
-        tty->low_latency = (state->port->flags & UPF_LOW_LATENCY) ? 1 : 0;
+        tty->low_latency = (state->uart_port->flags & UPF_LOW_LATENCY) ? 1 : 0;
        tty->alt_speed = 0;
-        state->info.port.tty = tty;
+        tty_port_tty_set(port, tty);
        /*
         * If the port is in the middle of closing, bail out now.
         */
        if (tty_hung_up_p(filp)) {
                retval = -EAGAIN;
-                state->count--;
+                port->count--;
-                mutex_unlock(&state->mutex);
+                mutex_unlock(&port->mutex);
                goto fail;
        }
        /*
         * Make sure the device is in D0 state.
         */
-        if (state->count == 1)
+        if (port->count == 1)
                uart_change_pm(state, 0);
        /*
@@ -1654,18 +1667,18 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         */
        if (retval == 0)
                retval = uart_block_til_ready(filp, state);
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        /*
         * If this is the first open to succeed, adjust things to suit.
         */
-        if (retval == 0 && !(state->info.flags & UIF_NORMAL_ACTIVE)) {
+        if (retval == 0 && !(port->flags & ASYNC_NORMAL_ACTIVE)) {
-                state->info.flags |= UIF_NORMAL_ACTIVE;
+                set_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
                uart_update_termios(state);
        }
- fail:
+fail:
        return retval;
 }
@@ -1687,57 +1700,58 @@ static const char *uart_type(struct uart_port *port)
 static void uart_line_info(struct seq_file *m, struct uart_driver *drv, int i)
 {
        struct uart_state *state = drv->state + i;
+        struct tty_port *port = &state->port;
        int pm_state;
-        struct uart_port *port = state->port;
+        struct uart_port *uport = state->uart_port;
        char stat_buf[32];
        unsigned int status;
        int mmio;
-        if (!port)
+        if (!uport)
                return;
-        mmio = port->iotype >= UPIO_MEM;
+        mmio = uport->iotype >= UPIO_MEM;
        seq_printf(m, "%d: uart:%s %s%08llX irq:%d",
-                        port->line, uart_type(port),
+                        uport->line, uart_type(uport),
                        mmio ? "mmio:0x" : "port:",
-                        mmio ? (unsigned long long)port->mapbase
+                        mmio ? (unsigned long long)uport->mapbase
-                             : (unsigned long long) port->iobase,
+                             : (unsigned long long)uport->iobase,
-                        port->irq);
+                        uport->irq);
-        if (port->type == PORT_UNKNOWN) {
+        if (uport->type == PORT_UNKNOWN) {
                seq_putc(m, '\n');
                return;
        }
        if (capable(CAP_SYS_ADMIN)) {
-                mutex_lock(&state->mutex);
+                mutex_lock(&port->mutex);
                pm_state = state->pm_state;
                if (pm_state)
                        uart_change_pm(state, 0);
-                spin_lock_irq(&port->lock);
+                spin_lock_irq(&uport->lock);
-                status = port->ops->get_mctrl(port);
+                status = uport->ops->get_mctrl(uport);
-                spin_unlock_irq(&port->lock);
+                spin_unlock_irq(&uport->lock);
                if (pm_state)
                        uart_change_pm(state, pm_state);
-                mutex_unlock(&state->mutex);
+                mutex_unlock(&port->mutex);
                seq_printf(m, " tx:%d rx:%d",
-                                port->icount.tx, port->icount.rx);
+                                uport->icount.tx, uport->icount.rx);
-                if (port->icount.frame)
+                if (uport->icount.frame)
                        seq_printf(m, " fe:%d",
-                                port->icount.frame);
+                                uport->icount.frame);
-                if (port->icount.parity)
+                if (uport->icount.parity)
                        seq_printf(m, " pe:%d",
-                                port->icount.parity);
+                                uport->icount.parity);
-                if (port->icount.brk)
+                if (uport->icount.brk)
                        seq_printf(m, " brk:%d",
-                                port->icount.brk);
+                                uport->icount.brk);
-                if (port->icount.overrun)
+                if (uport->icount.overrun)
                        seq_printf(m, " oe:%d",
-                                port->icount.overrun);
+                                uport->icount.overrun);
 #define INFOBIT(bit, str) \
-        if (port->mctrl & (bit)) \
+        if (uport->mctrl & (bit)) \
                strncat(stat_buf, (str), sizeof(stat_buf) - \
                        strlen(stat_buf) - 2)
 #define STATBIT(bit, str) \
@@ -1958,7 +1972,7 @@ EXPORT_SYMBOL_GPL(uart_set_options);
 static void uart_change_pm(struct uart_state *state, int pm_state)
 {
-        struct uart_port *port = state->port;
+        struct uart_port *port = state->uart_port;
        if (state->pm_state != pm_state) {
                if (port->ops->pm)
@@ -1982,132 +1996,138 @@ static int serial_match_port(struct device *dev, void *data)
        return dev->devt == devt; /* Actually, only one tty per port */
 }
-int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
+int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
 {
-        struct uart_state *state = drv->state + port->line;
+        struct uart_state *state = drv->state + uport->line;
+        struct tty_port *port = &state->port;
        struct device *tty_dev;
-        struct uart_match match = {port, drv};
+        struct uart_match match = {uport, drv};
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
-        if (!console_suspend_enabled && uart_console(port)) {
+        if (!console_suspend_enabled && uart_console(uport)) {
                /* we're going to avoid suspending serial console */
-                mutex_unlock(&state->mutex);
+                mutex_unlock(&port->mutex);
                return 0;
        }
-        tty_dev = device_find_child(port->dev, &match, serial_match_port);
+        tty_dev = device_find_child(uport->dev, &match, serial_match_port);
        if (device_may_wakeup(tty_dev)) {
-                enable_irq_wake(port->irq);
+                enable_irq_wake(uport->irq);
                put_device(tty_dev);
-                mutex_unlock(&state->mutex);
+                mutex_unlock(&port->mutex);
                return 0;
        }
-        port->suspended = 1;
+        uport->suspended = 1;
-        if (state->info.flags & UIF_INITIALIZED) {
+        if (port->flags & ASYNC_INITIALIZED) {
-                const struct uart_ops *ops = port->ops;
+                const struct uart_ops *ops = uport->ops;
                int tries;
-                state->info.flags = (state->info.flags & ~UIF_INITIALIZED)
+                set_bit(ASYNCB_SUSPENDED, &port->flags);
-                                     | UIF_SUSPENDED;
+                clear_bit(ASYNCB_INITIALIZED, &port->flags);
-                spin_lock_irq(&port->lock);
+                spin_lock_irq(&uport->lock);
-                ops->stop_tx(port);
+                ops->stop_tx(uport);
-                ops->set_mctrl(port, 0);
+                ops->set_mctrl(uport, 0);
-                ops->stop_rx(port);
+                ops->stop_rx(uport);
-                spin_unlock_irq(&port->lock);
+                spin_unlock_irq(&uport->lock);
                /*
                 * Wait for the transmitter to empty.
                 */
-                for (tries = 3; !ops->tx_empty(port) && tries; tries--)
+                for (tries = 3; !ops->tx_empty(uport) && tries; tries--)
                        msleep(10);
                if (!tries)
                        printk(KERN_ERR "%s%s%s%d: Unable to drain "
                                        "transmitter\n",
-                               port->dev ? dev_name(port->dev) : "",
+                               uport->dev ? dev_name(uport->dev) : "",
-                               port->dev ? ": " : "",
+                               uport->dev ? ": " : "",
                               drv->dev_name,
-                               drv->tty_driver->name_base + port->line);
+                               drv->tty_driver->name_base + uport->line);
-                ops->shutdown(port);
+                ops->shutdown(uport);
        }
        /*
         * Disable the console device before suspending.
         */
-        if (uart_console(port))
+        if (uart_console(uport))
-                console_stop(port->cons);
+                console_stop(uport->cons);
        uart_change_pm(state, 3);
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        return 0;
 }
-int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
+int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
 {
-        struct uart_state *state = drv->state + port->line;
+        struct uart_state *state = drv->state + uport->line;
+        struct tty_port *port = &state->port;
        struct device *tty_dev;
-        struct uart_match match = {port, drv};
+        struct uart_match match = {uport, drv};
+        struct ktermios termios;
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
-        if (!console_suspend_enabled && uart_console(port)) {
+        if (!console_suspend_enabled && uart_console(uport)) {
                /* no need to resume serial console, it wasn't suspended */
-                mutex_unlock(&state->mutex);
+                /*
+                 * First try to use the console cflag setting.
+                 */
+                memset(&termios, 0, sizeof(struct ktermios));
+                termios.c_cflag = uport->cons->cflag;
+                /*
+                 * If that's unset, use the tty termios setting.
+                 */
+                if (termios.c_cflag == 0)
+                        termios = *state->port.tty->termios;
+                else {
+                        termios.c_ispeed = termios.c_ospeed =
+                                tty_termios_input_baud_rate(&termios);
+                        termios.c_ispeed = termios.c_ospeed =
+                                tty_termios_baud_rate(&termios);
+                }
+                uport->ops->set_termios(uport, &termios, NULL);
+                mutex_unlock(&port->mutex);
                return 0;
        }
-        tty_dev = device_find_child(port->dev, &match, serial_match_port);
+        tty_dev = device_find_child(uport->dev, &match, serial_match_port);
-        if (!port->suspended && device_may_wakeup(tty_dev)) {
+        if (!uport->suspended && device_may_wakeup(tty_dev)) {
-                disable_irq_wake(port->irq);
+                disable_irq_wake(uport->irq);
-                mutex_unlock(&state->mutex);
+                mutex_unlock(&port->mutex);
                return 0;
        }
-        port->suspended = 0;
+        uport->suspended = 0;
        /*
         * Re-enable the console device after suspending.
         */
-        if (uart_console(port)) {
+        if (uart_console(uport)) {
-                struct ktermios termios;
-                /*
-                 * First try to use the console cflag setting.
-                 */
-                memset(&termios, 0, sizeof(struct ktermios));
-                termios.c_cflag = port->cons->cflag;
-                /*
-                 * If that's unset, use the tty termios setting.
-                 */
-                if (state->info.port.tty && termios.c_cflag == 0)
-                        termios = *state->info.port.tty->termios;
                uart_change_pm(state, 0);
-                port->ops->set_termios(port, &termios, NULL);
+                uport->ops->set_termios(uport, &termios, NULL);
-                console_start(port->cons);
+                console_start(uport->cons);
        }
-        if (state->info.flags & UIF_SUSPENDED) {
+        if (port->flags & ASYNC_SUSPENDED) {
-                const struct uart_ops *ops = port->ops;
+                const struct uart_ops *ops = uport->ops;
                int ret;
                uart_change_pm(state, 0);
-                spin_lock_irq(&port->lock);
+                spin_lock_irq(&uport->lock);
-                ops->set_mctrl(port, 0);
+                ops->set_mctrl(uport, 0);
-                spin_unlock_irq(&port->lock);
+                spin_unlock_irq(&uport->lock);
-                ret = ops->startup(port);
+                ret = ops->startup(uport);
                if (ret == 0) {
                        uart_change_speed(state, NULL);
-                        spin_lock_irq(&port->lock);
+                        spin_lock_irq(&uport->lock);
-                        ops->set_mctrl(port, port->mctrl);
+                        ops->set_mctrl(uport, uport->mctrl);
-                        ops->start_tx(port);
+                        ops->start_tx(uport);
-                        spin_unlock_irq(&port->lock);
+                        spin_unlock_irq(&uport->lock);
-                        state->info.flags |= UIF_INITIALIZED;
+                        set_bit(ASYNCB_INITIALIZED, &port->flags);
                } else {
                        /*
                         * Failed to resume - maybe hardware went away?
@@ -2117,10 +2137,10 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *port)
                        uart_shutdown(state);
                }
-                state->info.flags &= ~UIF_SUSPENDED;
+                clear_bit(ASYNCB_SUSPENDED, &port->flags);
        }
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        return 0;
 }
@@ -2232,10 +2252,10 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
        int parity = 'n';
        int flow = 'n';
-        if (!state || !state->port)
+        if (!state || !state->uart_port)
                return -1;
-        port = state->port;
+        port = state->uart_port;
        if (!(port->ops->poll_get_char && port->ops->poll_put_char))
                return -1;
@@ -2253,10 +2273,10 @@ static int uart_poll_get_char(struct tty_driver *driver, int line)
        struct uart_state *state = drv->state + line;
        struct uart_port *port;
-        if (!state || !state->port)
+        if (!state || !state->uart_port)
                return -1;
-        port = state->port;
+        port = state->uart_port;
        return port->ops->poll_get_char(port);
 }
@@ -2266,10 +2286,10 @@ static void uart_poll_put_char(struct tty_driver *driver, int line, char ch)
        struct uart_state *state = drv->state + line;
        struct uart_port *port;
-        if (!state || !state->port)
+        if (!state || !state->uart_port)
                return;
-        port = state->port;
+        port = state->uart_port;
        port->ops->poll_put_char(port, ch);
 }
 #endif
@@ -2360,14 +2380,12 @@ int uart_register_driver(struct uart_driver *drv)
         */
        for (i = 0; i < drv->nr; i++) {
                struct uart_state *state = drv->state + i;
+                struct tty_port *port = &state->port;
-                state->close_delay     = 500;   /* .5 seconds */
+                tty_port_init(port);
-                state->closing_wait    = 30000; /* 30 seconds */
+                port->close_delay     = 500;    /* .5 seconds */
-                mutex_init(&state->mutex);
+                port->closing_wait    = 30000;  /* 30 seconds */
+                tasklet_init(&state->tlet, uart_tasklet_action,
-                tty_port_init(&state->info.port);
-                init_waitqueue_head(&state->info.delta_msr_wait);
-                tasklet_init(&state->info.tlet, uart_tasklet_action,
                             (unsigned long)state);
        }
@@ -2408,69 +2426,71 @@ struct tty_driver *uart_console_device(struct console *co, int *index)
 /**
 *      uart_add_one_port - attach a driver-defined port structure
 *      @drv: pointer to the uart low level driver structure for this port
- *      @port: uart port structure to use for this port.
+ *      @uport: uart port structure to use for this port.
 *
 *      This allows the driver to register its own uart_port structure
 *      with the core driver.  The main purpose is to allow the low
 *      level uart drivers to expand uart_port, rather than having yet
 *      more levels of structures.
 */
-int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
+int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
 {
        struct uart_state *state;
+        struct tty_port *port;
        int ret = 0;
        struct device *tty_dev;
        BUG_ON(in_interrupt());
-        if (port->line >= drv->nr)
+        if (uport->line >= drv->nr)
                return -EINVAL;
-        state = drv->state + port->line;
+        state = drv->state + uport->line;
+        port = &state->port;
        mutex_lock(&port_mutex);
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
-        if (state->port) {
+        if (state->uart_port) {
                ret = -EINVAL;
                goto out;
        }
-        state->port = port;
+        state->uart_port = uport;
        state->pm_state = -1;
-        port->cons = drv->cons;
+        uport->cons = drv->cons;
-        port->info = &state->info;
+        uport->state = state;
        /*
         * If this port is a console, then the spinlock is already
         * initialised.
         */
-        if (!(uart_console(port) && (port->cons->flags & CON_ENABLED))) {
+        if (!(uart_console(uport) && (uport->cons->flags & CON_ENABLED))) {
-                spin_lock_init(&port->lock);
+                spin_lock_init(&uport->lock);
-                lockdep_set_class(&port->lock, &port_lock_key);
+                lockdep_set_class(&uport->lock, &port_lock_key);
        }
-        uart_configure_port(drv, state, port);
+        uart_configure_port(drv, state, uport);
        /*
         * Register the port whether it's detected or not.  This allows
         * setserial to be used to alter this ports parameters.
         */
-        tty_dev = tty_register_device(drv->tty_driver, port->line, port->dev);
+        tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev);
        if (likely(!IS_ERR(tty_dev))) {
                device_init_wakeup(tty_dev, 1);
                device_set_wakeup_enable(tty_dev, 0);
        } else
                printk(KERN_ERR "Cannot register tty device on line %d\n",
-                       port->line);
+                       uport->line);
        /*
         * Ensure UPF_DEAD is not set.
         */
-        port->flags &= ~UPF_DEAD;
+        uport->flags &= ~UPF_DEAD;
 out:
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        mutex_unlock(&port_mutex);
        return ret;
@@ -2479,22 +2499,22 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
 /**
 *      uart_remove_one_port - detach a driver defined port structure
 *      @drv: pointer to the uart low level driver structure for this port
- *      @port: uart port structure for this port
+ *      @uport: uart port structure for this port
 *
 *      This unhooks (and hangs up) the specified port structure from the
 *      core driver.  No further calls will be made to the low-level code
 *      for this port.
 */
-int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
+int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport)
 {
-        struct uart_state *state = drv->state + port->line;
+        struct uart_state *state = drv->state + uport->line;
-        struct uart_info *info;
+        struct tty_port *port = &state->port;
        BUG_ON(in_interrupt());
-        if (state->port != port)
+        if (state->uart_port != uport)
                printk(KERN_ALERT "Removing wrong port: %p != %p\n",
-                        state->port, port);
+                        state->uart_port, uport);
        mutex_lock(&port_mutex);
@@ -2502,37 +2522,35 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
         * Mark the port "dead" - this prevents any opens from
         * succeeding while we shut down the port.
         */
-        mutex_lock(&state->mutex);
+        mutex_lock(&port->mutex);
-        port->flags |= UPF_DEAD;
+        uport->flags |= UPF_DEAD;
-        mutex_unlock(&state->mutex);
+        mutex_unlock(&port->mutex);
        /*
         * Remove the devices from the tty layer
         */
-        tty_unregister_device(drv->tty_driver, port->line);
+        tty_unregister_device(drv->tty_driver, uport->line);
-        info = &state->info;
+        if (port->tty)
-        if (info && info->port.tty)
+                tty_vhangup(port->tty);
-                tty_vhangup(info->port.tty);
        /*
         * Free the port IO and memory resources, if any.
         */
-        if (port->type != PORT_UNKNOWN)
+        if (uport->type != PORT_UNKNOWN)
-                port->ops->release_port(port);
+                uport->ops->release_port(uport);
        /*
         * Indicate that there isn't a port here anymore.
         */
-        port->type = PORT_UNKNOWN;
+        uport->type = PORT_UNKNOWN;
        /*
         * Kill the tasklet, and free resources.
         */
-        if (info)
+        tasklet_kill(&state->tlet);
-                tasklet_kill(&info->tlet);
-        state->port = NULL;
+        state->uart_port = NULL;
        mutex_unlock(&port_mutex);
        return 0;
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index ed4648b556c7..a3bb49031a7f 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -884,6 +884,7 @@ static struct pcmcia_device_id serial_ids[] = {
        PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
        PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"),  /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
        PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),
+        PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "COMpad2.cis"),
        PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
        PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
        PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c
index 52db5cc3f900..2e71bbc04dac 100644
--- a/drivers/serial/serial_ks8695.c
+++ b/drivers/serial/serial_ks8695.c
@@ -154,7 +154,7 @@ static void ks8695uart_disable_ms(struct uart_port *port)
 static irqreturn_t ks8695uart_rx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        unsigned int status, ch, lsr, flg, max_count = 256;
        status = UART_GET_LSR(port);            /* clears pending LSR interrupts */
@@ -210,7 +210,7 @@ ignore_char:
 static irqreturn_t ks8695uart_tx_chars(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        unsigned int count;
        if (port->x_char) {
@@ -266,7 +266,7 @@ static irqreturn_t ks8695uart_modem_status(int irq, void *dev_id)
        if (status & URMS_URTERI)
                port->icount.rng++;
-        wake_up_interruptible(&port->info->delta_msr_wait);
+        wake_up_interruptible(&port->state->port.delta_msr_wait);
        return IRQ_HANDLED;
 }
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
index a7bf024a8286..ea744707c4d6 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/serial/serial_lh7a40x.c
@@ -138,7 +138,7 @@ static void lh7a40xuart_enable_ms (struct uart_port* port)
 static void lh7a40xuart_rx_chars (struct uart_port* port)
 {
-        struct tty_struct* tty = port->info->port.tty;
+        struct tty_struct* tty = port->state->port.tty;
        int cbRxMax = 256;      /* (Gross) limit on receive */
        unsigned int data;      /* Received data and status */
        unsigned int flag;
@@ -184,7 +184,7 @@ static void lh7a40xuart_rx_chars (struct uart_port* port)
 static void lh7a40xuart_tx_chars (struct uart_port* port)
 {
-        struct circ_buf* xmit = &port->info->xmit;
+        struct circ_buf* xmit = &port->state->xmit;
        int cbTxMax = port->fifosize;
        if (port->x_char) {
@@ -241,7 +241,7 @@ static void lh7a40xuart_modem_status (struct uart_port* port)
        if (delta & CTS)
                uart_handle_cts_change (port, status & CTS);
-        wake_up_interruptible (&port->info->delta_msr_wait);
+        wake_up_interruptible (&port->state->port.delta_msr_wait);
 }
 static irqreturn_t lh7a40xuart_int (int irq, void* dev_id)
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 54dd16d66a4b..0f7cf4c453e6 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struct uart_port *port)
 static inline void
 receive_chars(struct uart_txx9_port *up, unsigned int *status)
 {
-        struct tty_struct *tty = up->port.info->port.tty;
+        struct tty_struct *tty = up->port.state->port.tty;
        unsigned char ch;
        unsigned int disr = *status;
        int max_count = 256;
@@ -348,7 +348,7 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status)
 static inline void transmit_chars(struct uart_txx9_port *up)
 {
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        int count;
        if (up->port.x_char) {
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 8e2feb563347..85119fb7cb50 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -272,7 +272,8 @@ static inline void sci_init_pins(struct uart_port *port, unsigned int cflag)
                __raw_writew(data, PSCR);
        }
 }
-#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
+#elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7763) || \
      defined(CONFIG_CPU_SUBTYPE_SH7780) || \
      defined(CONFIG_CPU_SUBTYPE_SH7785) || \
      defined(CONFIG_CPU_SUBTYPE_SH7786) || \
@@ -360,7 +361,7 @@ static inline int sci_rxroom(struct uart_port *port)
 static void sci_transmit_chars(struct uart_port *port)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        unsigned int stopped = uart_tx_stopped(port);
        unsigned short status;
        unsigned short ctrl;
@@ -425,7 +426,7 @@ static void sci_transmit_chars(struct uart_port *port)
 static inline void sci_receive_chars(struct uart_port *port)
 {
        struct sci_port *sci_port = to_sci_port(port);
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        int i, count, copied = 0;
        unsigned short status;
        unsigned char flag;
@@ -545,7 +546,7 @@ static inline int sci_handle_errors(struct uart_port *port)
 {
        int copied = 0;
        unsigned short status = sci_in(port, SCxSR);
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        if (status & SCxSR_ORER(port)) {
                /* overrun error */
@@ -599,7 +600,7 @@ static inline int sci_handle_errors(struct uart_port *port)
 static inline int sci_handle_fifo_overrun(struct uart_port *port)
 {
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        int copied = 0;
        if (port->type != PORT_SCIF)
@@ -622,7 +623,7 @@ static inline int sci_handle_breaks(struct uart_port *port)
 {
        int copied = 0;
        unsigned short status = sci_in(port, SCxSR);
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        struct sci_port *s = to_sci_port(port);
        if (uart_handle_break(port))
@@ -662,10 +663,11 @@ static irqreturn_t sci_rx_interrupt(int irq, void *port)
 static irqreturn_t sci_tx_interrupt(int irq, void *ptr)
 {
        struct uart_port *port = ptr;
+        unsigned long flags;
-        spin_lock_irq(&port->lock);
+        spin_lock_irqsave(&port->lock, flags);
        sci_transmit_chars(port);
-        spin_unlock_irq(&port->lock);
+        spin_unlock_irqrestore(&port->lock, flags);
        return IRQ_HANDLED;
 }
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 38072c15b845..3e2fcf93b42e 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -112,6 +112,13 @@
 #elif defined(CONFIG_H8S2678)
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
 # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7757)
+# define SCSPTR0 0xfe4b0020
+# define SCSPTR1 0xfe4b0020
+# define SCSPTR2 0xfe4b0020
+# define SCIF_ORER 0x0001
+# define SCSCR_INIT(port)       0x38
+# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
 # define SCSPTR0 0xffe00024 /* 16 bit SCIF */
 # define SCSPTR1 0xffe08024 /* 16 bit SCIF */
@@ -562,6 +569,16 @@ static inline int sci_rxd_in(struct uart_port *port)
                return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
        return 1;
 }
+#elif defined(CONFIG_CPU_SUBTYPE_SH7757)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xfe4b0000)
+                return ctrl_inw(SCSPTR0) & 0x0001 ? 1 : 0;
+        if (port->mapbase == 0xfe4c0000)
+                return ctrl_inw(SCSPTR1) & 0x0001 ? 1 : 0;
+        if (port->mapbase == 0xfe4d0000)
+                return ctrl_inw(SCSPTR2) & 0x0001 ? 1 : 0;
+}
 #elif defined(CONFIG_CPU_SUBTYPE_SH7760)
 static inline int sci_rxd_in(struct uart_port *port)
 {
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index d5276c012f78..9794e0cd3dcc 100644
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -469,9 +469,9 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
                return;
        }
-        if (port->sc_port.info) {
+        if (port->sc_port.state) {
                /* The serial_core stuffs are initilized, use them */
-                tty = port->sc_port.info->port.tty;
+                tty = port->sc_port.state->port.tty;
        }
        else {
                /* Not registered yet - can't pass to tty layer.  */
@@ -550,9 +550,9 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw)
        BUG_ON(!port->sc_is_asynch);
-        if (port->sc_port.info) {
+        if (port->sc_port.state) {
                /* We're initilized, using serial core infrastructure */
-                xmit = &port->sc_port.info->xmit;
+                xmit = &port->sc_port.state->xmit;
        } else {
                /* Probably sn_sal_switch_to_asynch has been run but serial core isn't
                 * initilized yet.  Just return.  Writes are going through
@@ -927,7 +927,7 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count)
        /* We can't look at the xmit buffer if we're not registered with serial core
         *  yet.  So only do the fancy recovery after registering
         */
-        if (!port->sc_port.info) {
+        if (!port->sc_port.state) {
                /* Not yet registered with serial core - simple case */
                puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
                return;
@@ -936,8 +936,8 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count)
        /* somebody really wants this output, might be an
         * oops, kdb, panic, etc.  make sure they get it. */
        if (spin_is_locked(&port->sc_port.lock)) {
-                int lhead = port->sc_port.info->xmit.head;
+                int lhead = port->sc_port.state->xmit.head;
-                int ltail = port->sc_port.info->xmit.tail;
+                int ltail = port->sc_port.state->xmit.tail;
                int counter, got_lock = 0;
                /*
@@ -962,13 +962,13 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count)
                                break;
                        } else {
                                /* still locked */
-                                if ((lhead != port->sc_port.info->xmit.head)
+                                if ((lhead != port->sc_port.state->xmit.head)
                                    || (ltail !=
-                                        port->sc_port.info->xmit.tail)) {
+                                        port->sc_port.state->xmit.tail)) {
                                        lhead =
-                                                port->sc_port.info->xmit.head;
+                                                port->sc_port.state->xmit.head;
                                        ltail =
-                                                port->sc_port.info->xmit.tail;
+                                                port->sc_port.state->xmit.tail;
                                        counter = 0;
                                }
                        }
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 1df5325faab2..d548652dee50 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -184,8 +184,8 @@ static struct tty_struct *receive_chars(struct uart_port *port)
 {
        struct tty_struct *tty = NULL;
-        if (port->info != NULL)         /* Unopened serial console */
+        if (port->state != NULL)                /* Unopened serial console */
-                tty = port->info->port.tty;
+                tty = port->state->port.tty;
        if (sunhv_ops->receive_chars(port, tty))
                sun_do_break();
@@ -197,10 +197,10 @@ static void transmit_chars(struct uart_port *port)
 {
        struct circ_buf *xmit;
-        if (!port->info)
+        if (!port->state)
                return;
-        xmit = &port->info->xmit;
+        xmit = &port->state->xmit;
        if (uart_circ_empty(xmit) || uart_tx_stopped(port))
                return;
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 0355efe115d9..d1ad34128635 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -117,8 +117,8 @@ receive_chars(struct uart_sunsab_port *up,
        int count = 0;
        int i;
-        if (up->port.info != NULL)              /* Unopened serial console */
+        if (up->port.state != NULL)             /* Unopened serial console */
-                tty = up->port.info->port.tty;
+                tty = up->port.state->port.tty;
        /* Read number of BYTES (Character + Status) available. */
        if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
@@ -229,7 +229,7 @@ static void sunsab_tx_idle(struct uart_sunsab_port *);
 static void transmit_chars(struct uart_sunsab_port *up,
                           union sab82532_irq_status *stat)
 {
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        int i;
        if (stat->sreg.isr1 & SAB82532_ISR1_ALLS) {
@@ -297,7 +297,7 @@ static void check_status(struct uart_sunsab_port *up,
                up->port.icount.dsr++;
        }
-        wake_up_interruptible(&up->port.info->delta_msr_wait);
+        wake_up_interruptible(&up->port.state->port.delta_msr_wait);
 }
 static irqreturn_t sunsab_interrupt(int irq, void *dev_id)
@@ -429,7 +429,7 @@ static void sunsab_tx_idle(struct uart_sunsab_port *up)
 static void sunsab_start_tx(struct uart_port *port)
 {
        struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        int i;
        up->interrupt_mask1 &= ~(SAB82532_IMR1_ALLS|SAB82532_IMR1_XPR);
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 47c6837850b1..68d262b15749 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -311,7 +311,7 @@ static void sunsu_enable_ms(struct uart_port *port)
 static struct tty_struct *
 receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 {
-        struct tty_struct *tty = up->port.info->port.tty;
+        struct tty_struct *tty = up->port.state->port.tty;
        unsigned char ch, flag;
        int max_count = 256;
        int saw_console_brk = 0;
@@ -389,7 +389,7 @@ receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 static void transmit_chars(struct uart_sunsu_port *up)
 {
-        struct circ_buf *xmit = &up->port.info->xmit;
+        struct circ_buf *xmit = &up->port.state->xmit;
        int count;
        if (up->port.x_char) {
@@ -441,7 +441,7 @@ static void check_modem_status(struct uart_sunsu_port *up)
        if (status & UART_MSR_DCTS)
                uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
-        wake_up_interruptible(&up->port.info->delta_msr_wait);
+        wake_up_interruptible(&up->port.state->port.delta_msr_wait);
 }
 static irqreturn_t sunsu_serial_interrupt(int irq, void *dev_id)
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index e09d3cebb4fb..ef693ae22e7f 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -328,9 +328,9 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
        unsigned char ch, r1, flag;
        tty = NULL;
-        if (up->port.info != NULL &&            /* Unopened serial console */
+        if (up->port.state != NULL &&           /* Unopened serial console */
-            up->port.info->port.tty != NULL)    /* Keyboard || mouse */
+            up->port.state->port.tty != NULL)   /* Keyboard || mouse */
-                tty = up->port.info->port.tty;
+                tty = up->port.state->port.tty;
        for (;;) {
@@ -451,7 +451,7 @@ static void sunzilog_status_handle(struct uart_sunzilog_port *up,
                        uart_handle_cts_change(&up->port,
                                               (status & CTS));
-                wake_up_interruptible(&up->port.info->delta_msr_wait);
+                wake_up_interruptible(&up->port.state->port.delta_msr_wait);
        }
        up->prev_status = status;
@@ -501,9 +501,9 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
                return;
        }
-        if (up->port.info == NULL)
+        if (up->port.state == NULL)
                goto ack_tx_int;
-        xmit = &up->port.info->xmit;
+        xmit = &up->port.state->xmit;
        if (uart_circ_empty(xmit))
                goto ack_tx_int;
@@ -705,7 +705,7 @@ static void sunzilog_start_tx(struct uart_port *port)
                port->icount.tx++;
                port->x_char = 0;
        } else {
-                struct circ_buf *xmit = &port->info->xmit;
+                struct circ_buf *xmit = &port->state->xmit;
                writeb(xmit->buf[xmit->tail], &channel->data);
                ZSDELAY();
diff --git a/drivers/serial/timbuart.c b/drivers/serial/timbuart.c
index 063a313b755c..34b31da01d09 100644
--- a/drivers/serial/timbuart.c
+++ b/drivers/serial/timbuart.c
@@ -77,7 +77,7 @@ static void timbuart_flush_buffer(struct uart_port *port)
 static void timbuart_rx_chars(struct uart_port *port)
 {
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        while (ioread32(port->membase + TIMBUART_ISR) & RXDP) {
                u8 ch = ioread8(port->membase + TIMBUART_RXFIFO);
@@ -86,7 +86,7 @@ static void timbuart_rx_chars(struct uart_port *port)
        }
        spin_unlock(&port->lock);
-        tty_flip_buffer_push(port->info->port.tty);
+        tty_flip_buffer_push(port->state->port.tty);
        spin_lock(&port->lock);
        dev_dbg(port->dev, "%s - total read %d bytes\n",
@@ -95,7 +95,7 @@ static void timbuart_rx_chars(struct uart_port *port)
 static void timbuart_tx_chars(struct uart_port *port)
 {
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        while (!(ioread32(port->membase + TIMBUART_ISR) & TXBF) &&
                !uart_circ_empty(xmit)) {
@@ -118,7 +118,7 @@ static void timbuart_handle_tx_port(struct uart_port *port, u32 isr, u32 *ier)
 {
        struct timbuart_port *uart =
                container_of(port, struct timbuart_port, port);
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        if (uart_circ_empty(xmit) || uart_tx_stopped(port))
                return;
@@ -231,7 +231,7 @@ static void timbuart_mctrl_check(struct uart_port *port, u32 isr, u32 *ier)
                iowrite32(CTS_DELTA, port->membase + TIMBUART_ISR);
                cts = timbuart_get_mctrl(port);
                uart_handle_cts_change(port, cts & TIOCM_CTS);
-                wake_up_interruptible(&port->info->delta_msr_wait);
+                wake_up_interruptible(&port->state->port.delta_msr_wait);
        }
        *ier |= CTS_DELTA;
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 3317148a4b93..377f2712289e 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -75,7 +75,7 @@ static struct uart_port ulite_ports[ULITE_NR_UARTS];
 static int ulite_receive(struct uart_port *port, int stat)
 {
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        unsigned char ch = 0;
        char flag = TTY_NORMAL;
@@ -125,7 +125,7 @@ static int ulite_receive(struct uart_port *port, int stat)
 static int ulite_transmit(struct uart_port *port, int stat)
 {
-        struct circ_buf *xmit  = &port->info->xmit;
+        struct circ_buf *xmit  = &port->state->xmit;
        if (stat & ULITE_STATUS_TXFULL)
                return 0;
@@ -154,17 +154,22 @@ static int ulite_transmit(struct uart_port *port, int stat)
 static irqreturn_t ulite_isr(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-        int busy;
+        int busy, n = 0;
        do {
                int stat = readb(port->membase + ULITE_STATUS);
                busy  = ulite_receive(port, stat);
                busy |= ulite_transmit(port, stat);
+                n++;
        } while (busy);
-        tty_flip_buffer_push(port->info->port.tty);
+        /* work done? */
+        if (n > 1) {
-        return IRQ_HANDLED;
+                tty_flip_buffer_push(port->state->port.tty);
+                return IRQ_HANDLED;
+        } else {
+                return IRQ_NONE;
+        }
 }
 static unsigned int ulite_tx_empty(struct uart_port *port)
@@ -221,7 +226,7 @@ static int ulite_startup(struct uart_port *port)
        int ret;
        ret = request_irq(port->irq, ulite_isr,
-                          IRQF_DISABLED | IRQF_SAMPLE_RANDOM, "uartlite", port);
+                          IRQF_SHARED | IRQF_SAMPLE_RANDOM, "uartlite", port);
        if (ret)
                return ret;
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index e945e780b5c9..0c08f286a2ef 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -327,7 +327,7 @@ static int qe_uart_tx_pump(struct uart_qe_port *qe_port)
        unsigned char *p;
        unsigned int count;
        struct uart_port *port = &qe_port->port;
-        struct circ_buf *xmit = &port->info->xmit;
+        struct circ_buf *xmit = &port->state->xmit;
        bdp = qe_port->rx_cur;
@@ -466,7 +466,7 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port)
        int i;
        unsigned char ch, *cp;
        struct uart_port *port = &qe_port->port;
-        struct tty_struct *tty = port->info->port.tty;
+        struct tty_struct *tty = port->state->port.tty;
        struct qe_bd *bdp;
        u16 status;
        unsigned int flg;
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index dac550e57c29..3beb6ab4fa68 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -318,7 +318,7 @@ static inline void receive_chars(struct uart_port *port, uint8_t *status)
        char flag;
        int max_count = RX_MAX_COUNT;
-        tty = port->info->port.tty;
+        tty = port->state->port.tty;
        lsr = *status;
        do {
@@ -386,7 +386,7 @@ static inline void check_modem_status(struct uart_port *port)
        if (msr & UART_MSR_DCTS)
                uart_handle_cts_change(port, msr & UART_MSR_CTS);
-        wake_up_interruptible(&port->info->delta_msr_wait);
+        wake_up_interruptible(&port->state->port.delta_msr_wait);
 }
 static inline void transmit_chars(struct uart_port *port)
@@ -394,7 +394,7 @@ static inline void transmit_chars(struct uart_port *port)
        struct circ_buf *xmit;
        int max_count = TX_MAX_COUNT;
-        xmit = &port->info->xmit;
+        xmit = &port->state->xmit;
        if (port->x_char) {
                siu_write(port, UART_TX, port->x_char);
diff --git a/drivers/serial/zs.c b/drivers/serial/zs.c
index d8c2809b1ab6..1a7fd3e70315 100644
--- a/drivers/serial/zs.c
+++ b/drivers/serial/zs.c
@@ -602,12 +602,12 @@ static void zs_receive_chars(struct zs_port *zport)
                uart_insert_char(uport, status, Rx_OVR, ch, flag);
        }
-        tty_flip_buffer_push(uport->info->port.tty);
+        tty_flip_buffer_push(uport->state->port.tty);
 }
 static void zs_raw_transmit_chars(struct zs_port *zport)
 {
-        struct circ_buf *xmit = &zport->port.info->xmit;
+        struct circ_buf *xmit = &zport->port.state->xmit;
        /* XON/XOFF chars.  */
        if (zport->port.x_char) {
@@ -686,7 +686,7 @@ static void zs_status_handle(struct zs_port *zport, struct zs_port *zport_a)
                        uport->icount.rng++;
                if (delta)
-                        wake_up_interruptible(&uport->info->delta_msr_wait);
+                        wake_up_interruptible(&uport->state->port.delta_msr_wait);
                spin_lock(&scc->zlock);
        }