27 files changed, 289 insertions, 420 deletions

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 8c5c276c5577..7572665a8855 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -375,23 +375,18 @@ static void serial21285_setup_ports(void)
 }
 
 #ifdef CONFIG_SERIAL_21285_CONSOLE
+static void serial21285_console_putchar(struct uart_port *port, int ch)
+{
+        while (*CSR_UARTFLG & 0x20)
+                barrier();
+        *CSR_UARTDR = ch;
+}
 
 static void
 serial21285_console_write(struct console *co, const char *s,
                           unsigned int count)
 {
-        int i;
-
-        for (i = 0; i < count; i++) {
-                while (*CSR_UARTFLG & 0x20)
-                        barrier();
-                *CSR_UARTDR = s[i];
-                if (s[i] == '\n') {
-                        while (*CSR_UARTFLG & 0x20)
-                                barrier();
-                        *CSR_UARTDR = '\r';
-                }
-        }
+        uart_console_write(&serial21285_port, s, count, serial21285_console_putchar);
 }
 
 static void __init
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 7f0f35a05dca..b88a7c1158af 100644
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -101,8 +101,6 @@ struct tty_driver *serial_driver;
 
 #define RS_ISR_PASS_LIMIT 256
 
-#define _INLINE_ inline
-
 static void change_speed(struct m68k_serial *info);
 
 /*
@@ -262,7 +260,7 @@ static void batten_down_hatches(void)
         /* Drop into the debugger */
 }
 
-static _INLINE_ void status_handle(struct m68k_serial *info, unsigned short status)
+static void status_handle(struct m68k_serial *info, unsigned short status)
 {
 #if 0
         if(status & DCD) {
@@ -289,7 +287,8 @@ static _INLINE_ void status_handle(struct m68k_serial *info, unsigned short stat
         return;
 }
 
-static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *regs, unsigned short rx)
+static void receive_chars(struct m68k_serial *info, struct pt_regs *regs,
+                          unsigned short rx)
 {
         struct tty_struct *tty = info->tty;
         m68328_uart *uart = &uart_addr[info->line];
@@ -359,7 +358,7 @@ clear_and_exit:
         return;
 }
 
-static _INLINE_ void transmit_chars(struct m68k_serial *info)
+static void transmit_chars(struct m68k_serial *info)
 {
         m68328_uart *uart = &uart_addr[info->line];
 
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 7aca22c9976d..5996d3cd0ed8 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2182,6 +2182,14 @@ static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)
         }
 }
 
+static void serial8250_console_putchar(struct uart_port *port, int ch)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        wait_for_xmitr(up, UART_LSR_THRE);
+        serial_out(up, UART_TX, ch);
+}
+
 /*
  *      Print a string to the serial port trying not to disturb
  *      any possible real use of the port...
@@ -2193,7 +2201,6 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_8250_port *up = &serial8250_ports[co->index];
         unsigned int ier;
-        int i;
 
         touch_nmi_watchdog();
 
@@ -2207,22 +2214,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
         else
                 serial_out(up, UART_IER, 0);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++, s++) {
-                wait_for_xmitr(up, UART_LSR_THRE);
-
-                /*
-                 *      Send the character out.
-                 *      If a LF, also do CR...
-                 */
-                serial_out(up, UART_TX, *s);
-                if (*s == 10) {
-                        wait_for_xmitr(up, UART_LSR_THRE);
-                        serial_out(up, UART_TX, 13);
-                }
-        }
+        uart_console_write(&up->port, s, count, serial8250_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
index 59ba5d993b4b..7e511199b4c5 100644
--- a/drivers/serial/8250_early.c
+++ b/drivers/serial/8250_early.c
@@ -74,7 +74,7 @@ static void __init wait_for_xmitr(struct uart_port *port)
         }
 }
 
-static void __init putc(struct uart_port *port, unsigned char c)
+static void __init putc(struct uart_port *port, int c)
 {
         wait_for_xmitr(port);
         serial_out(port, UART_TX, c);
@@ -89,12 +89,7 @@ static void __init early_uart_write(struct console *console, const char *s, unsi
         ier = serial_in(port, UART_IER);
         serial_out(port, UART_IER, 0);
 
-        while (*s && count-- > 0) {
-                putc(port, *s);
-                if (*s == '\n')
-                        putc(port, '\r');
-                s++;
-        }
+        uart_console_write(port, s, count, putc);
 
         /* Wait for transmitter to become empty and restore the IER */
         wait_for_xmitr(port);
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 89e5413cc2a3..c66ef96c71b4 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -866,7 +866,7 @@ config SERIAL_M32R_PLDSIO
 
 config SERIAL_TXX9
         bool "TMPTX39XX/49XX SIO support"
-        depends HAS_TXX9_SERIAL && BROKEN
+        depends HAS_TXX9_SERIAL
         select SERIAL_CORE
         default y
 
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 321a3b3a5728..e04d5e82d9ae 100644
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -591,12 +591,18 @@ static struct uart_amba_port amba_ports[UART_NR] = {
 
 #ifdef CONFIG_SERIAL_AMBA_PL010_CONSOLE
 
+static void pl010_console_putchar(struct uart_port *port, int ch)
+{
+        while (!UART_TX_READY(UART_GET_FR(port)))
+                barrier();
+        UART_PUT_CHAR(port, ch);
+}
+
 static void
 pl010_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_port *port = &amba_ports[co->index].port;
         unsigned int status, old_cr;
-        int i;
 
         /*
          *      First save the CR then disable the interrupts
@@ -604,21 +610,7 @@ pl010_console_write(struct console *co, const char *s, unsigned int count)
         old_cr = UART_GET_CR(port);
         UART_PUT_CR(port, UART01x_CR_UARTEN);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++) {
-                do {
-                        status = UART_GET_FR(port);
-                } while (!UART_TX_READY(status));
-                UART_PUT_CHAR(port, s[i]);
-                if (s[i] == '\n') {
-                        do {
-                                status = UART_GET_FR(port);
-                        } while (!UART_TX_READY(status));
-                        UART_PUT_CHAR(port, '\r');
-                }
-        }
+        uart_console_write(port, s, count, pl010_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 034a029e356e..3d966cfc9a38 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -587,14 +587,12 @@ static struct uart_amba_port *amba_ports[UART_NR];
 
 #ifdef CONFIG_SERIAL_AMBA_PL011_CONSOLE
 
-static inline void
-pl011_console_write_char(struct uart_amba_port *uap, char ch)
+static void pl011_console_putchar(struct uart_port *port, int ch)
 {
-        unsigned int status;
+        struct uart_amba_port *uap = (struct uart_amba_port *)port;
 
-        do {
-                status = readw(uap->port.membase + UART01x_FR);
-        } while (status & UART01x_FR_TXFF);
+        while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_TXFF)
+                barrier();
         writew(ch, uap->port.membase + UART01x_DR);
 }
 
@@ -603,7 +601,6 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_amba_port *uap = amba_ports[co->index];
         unsigned int status, old_cr, new_cr;
-        int i;
 
         clk_enable(uap->clk);
 
@@ -615,14 +612,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
         new_cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
         writew(new_cr, uap->port.membase + UART011_CR);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++) {
-                pl011_console_write_char(uap, s[i]);
-                if (s[i] == '\n')
-                        pl011_console_write_char(uap, '\r');
-        }
+        uart_console_write(&uap->port, s, count, pl011_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c
index 2113feb75c39..6547fe0cef96 100644
--- a/drivers/serial/at91_serial.c
+++ b/drivers/serial/at91_serial.c
@@ -711,6 +711,12 @@ void __init at91_register_uart(int idx, int port)
 }
 
 #ifdef CONFIG_SERIAL_AT91_CONSOLE
+static void at91_console_putchar(struct uart_port *port, int ch)
+{
+        while (!(UART_GET_CSR(port) & AT91_US_TXRDY))
+                barrier();
+        UART_PUT_CHAR(port, ch);
+}
 
 /*
  * Interrupts are disabled on entering
@@ -718,7 +724,7 @@ void __init at91_register_uart(int idx, int port)
 static void at91_console_write(struct console *co, const char *s, u_int count)
 {
         struct uart_port *port = at91_ports + co->index;
-        unsigned int status, i, imr;
+        unsigned int status, imr;
 
         /*
          *      First, save IMR and then disable interrupts
@@ -726,21 +732,7 @@ static void at91_console_write(struct console *co, const char *s, u_int count)
         imr = UART_GET_IMR(port);       /* get interrupt mask */
         UART_PUT_IDR(port, AT91_US_RXRDY | AT91_US_TXRDY);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++) {
-                do {
-                        status = UART_GET_CSR(port);
-                } while (!(status & AT91_US_TXRDY));
-                UART_PUT_CHAR(port, s[i]);
-                if (s[i] == '\n') {
-                        do {
-                                status = UART_GET_CSR(port);
-                        } while (!(status & AT91_US_TXRDY));
-                        UART_PUT_CHAR(port, '\r');
-                }
-        }
+        uart_console_write(port, s, count, at91_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c
index 344022fe53ef..948880ac5878 100644
--- a/drivers/serial/au1x00_uart.c
+++ b/drivers/serial/au1x00_uart.c
@@ -133,13 +133,12 @@ static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = {
         { "AU1X00_UART",16,     UART_CLEAR_FIFO | UART_USE_FIFO },
 };
 
-static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
+static unsigned int serial_in(struct uart_8250_port *up, int offset)
 {
         return au_readl((unsigned long)up->port.membase + offset);
 }
 
-static _INLINE_ void
-serial_out(struct uart_8250_port *up, int offset, int value)
+static void serial_out(struct uart_8250_port *up, int offset, int value)
 {
         au_writel(value, (unsigned long)up->port.membase + offset);
 }
@@ -237,7 +236,7 @@ static void serial8250_enable_ms(struct uart_port *port)
         serial_out(up, UART_IER, up->ier);
 }
 
-static _INLINE_ void
+static void
 receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
 {
         struct tty_struct *tty = up->port.info->tty;
@@ -312,7 +311,7 @@ receive_chars(struct uart_8250_port *up, int *status, struct pt_regs *regs)
         spin_lock(&up->port.lock);
 }
 
-static _INLINE_ void transmit_chars(struct uart_8250_port *up)
+static void transmit_chars(struct uart_8250_port *up)
 {
         struct circ_buf *xmit = &up->port.info->xmit;
         int count;
@@ -346,7 +345,7 @@ static _INLINE_ void transmit_chars(struct uart_8250_port *up)
                 serial8250_stop_tx(&up->port);
 }
 
-static _INLINE_ void check_modem_status(struct uart_8250_port *up)
+static void check_modem_status(struct uart_8250_port *up)
 {
         int status;
 
@@ -1121,6 +1120,14 @@ static inline void wait_for_xmitr(struct uart_8250_port *up)
         }
 }
 
+static void au1x00_console_putchar(struct uart_port *port, int ch)
+{
+        struct uart_8250_port *up = (struct uart_8250_port *)port;
+
+        wait_for_xmitr(up);
+        serial_out(up, UART_TX, ch);
+}
+
 /*
  *      Print a string to the serial port trying not to disturb
  *      any possible real use of the port...
@@ -1132,7 +1139,6 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_8250_port *up = &serial8250_ports[co->index];
         unsigned int ier;
-        int i;
 
         /*
          *      First save the UER then disable the interrupts
@@ -1140,22 +1146,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
         ier = serial_in(up, UART_IER);
         serial_out(up, UART_IER, 0);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++, s++) {
-                wait_for_xmitr(up);
-
-                /*
-                 *      Send the character out.
-                 *      If a LF, also do CR...
-                 */
-                serial_out(up, UART_TX, *s);
-                if (*s == 10) {
-                        wait_for_xmitr(up);
-                        serial_out(up, UART_TX, 13);
-                }
-        }
+        uart_console_write(&up->port, s, count, au1x00_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index ce7b2e4ecd17..2691112c84ad 100644
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -424,6 +424,13 @@ static struct uart_port clps711x_ports[UART_NR] = {
 };
 
 #ifdef CONFIG_SERIAL_CLPS711X_CONSOLE
+static void clps711xuart_console_putchar(struct uart_port *port, int ch)
+{
+        while (clps_readl(SYSFLG(port)) & SYSFLG_UTXFF)
+                barrier();
+        clps_writel(ch, UARTDR(port));
+}
+
 /*
  *      Print a string to the serial port trying not to disturb
  *      any possible real use of the port...
@@ -438,7 +445,6 @@ clps711xuart_console_write(struct console *co, const char *s,
 {
         struct uart_port *port = clps711x_ports + co->index;
         unsigned int status, syscon;
-        int i;
 
         /*
          *      Ensure that the port is enabled.
@@ -446,21 +452,7 @@ clps711xuart_console_write(struct console *co, const char *s,
         syscon = clps_readl(SYSCON(port));
         clps_writel(syscon | SYSCON_UARTEN, SYSCON(port));
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++) {
-                do {
-                        status = clps_readl(SYSFLG(port));
-                } while (status & SYSFLG_UTXFF);
-                clps_writel(s[i], UARTDR(port));
-                if (s[i] == '\n') {
-                        do {
-                                status = clps_readl(SYSFLG(port));
-                        } while (status & SYSFLG_UTXFF);
-                        clps_writel('\r', UARTDR(port));
-                }
-        }
+        uart_console_write(port, s, count, clps711xuart_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index be12623d8544..89700141f87e 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -481,8 +481,6 @@ static char *serial_version = "$Revision: 1.25 $";
 #include "serial_compat.h"
 #endif
 
-#define _INLINE_ inline
-
 struct tty_driver *serial_driver;
 
 /* serial subtype definitions */
@@ -591,8 +589,6 @@ static void rs_throttle(struct tty_struct * tty);
 static void rs_wait_until_sent(struct tty_struct *tty, int timeout);
 static int rs_write(struct tty_struct * tty, int from_user,
                     const unsigned char *buf, int count);
-extern _INLINE_ int rs_raw_write(struct tty_struct * tty, int from_user,
-                            const unsigned char *buf, int count);
 #ifdef CONFIG_ETRAX_RS485
 static int e100_write_rs485(struct tty_struct * tty, int from_user,
                             const unsigned char *buf, int count);
@@ -1538,8 +1534,7 @@ e100_enable_rxdma_irq(struct e100_serial *info)
 
 /* the tx DMA uses only dma_descr interrupt */
 
-static _INLINE_ void
-e100_disable_txdma_irq(struct e100_serial *info)
+static void e100_disable_txdma_irq(struct e100_serial *info)
 {
 #ifdef SERIAL_DEBUG_INTR
         printk("txdma_irq(%d): 0\n",info->line);
@@ -1548,8 +1543,7 @@ e100_disable_txdma_irq(struct e100_serial *info)
         *R_IRQ_MASK2_CLR = info->irq;
 }
 
-static _INLINE_ void
-e100_enable_txdma_irq(struct e100_serial *info)
+static void e100_enable_txdma_irq(struct e100_serial *info)
 {
 #ifdef SERIAL_DEBUG_INTR
         printk("txdma_irq(%d): 1\n",info->line);
@@ -1558,8 +1552,7 @@ e100_enable_txdma_irq(struct e100_serial *info)
         *R_IRQ_MASK2_SET = info->irq;
 }
 
-static _INLINE_ void
-e100_disable_txdma_channel(struct e100_serial *info)
+static void e100_disable_txdma_channel(struct e100_serial *info)
 {
         unsigned long flags;
 
@@ -1599,8 +1592,7 @@ e100_disable_txdma_channel(struct e100_serial *info)
 }
 
 
-static _INLINE_ void
-e100_enable_txdma_channel(struct e100_serial *info)
+static void e100_enable_txdma_channel(struct e100_serial *info)
 {
         unsigned long flags;
 
@@ -1625,8 +1617,7 @@ e100_enable_txdma_channel(struct e100_serial *info)
         restore_flags(flags);
 }
 
-static _INLINE_ void
-e100_disable_rxdma_channel(struct e100_serial *info)
+static void e100_disable_rxdma_channel(struct e100_serial *info)
 {
         unsigned long flags;
 
@@ -1665,8 +1656,7 @@ e100_disable_rxdma_channel(struct e100_serial *info)
 }
 
 
-static _INLINE_ void
-e100_enable_rxdma_channel(struct e100_serial *info)
+static void e100_enable_rxdma_channel(struct e100_serial *info)
 {
         unsigned long flags;
 
@@ -1913,9 +1903,7 @@ rs_start(struct tty_struct *tty)
  * This routine is used by the interrupt handler to schedule
  * processing in the software interrupt portion of the driver.
  */
-static _INLINE_ void
-rs_sched_event(struct e100_serial *info,
-                                    int event)
+static void rs_sched_event(struct e100_serial *info, int event)
 {
         if (info->event & (1 << event))
                 return;
@@ -2155,8 +2143,9 @@ add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char fl
         return 1;
 }
 
-extern _INLINE_ unsigned int
-handle_descr_data(struct e100_serial *info, struct etrax_dma_descr *descr, unsigned int recvl)
+static unsigned int handle_descr_data(struct e100_serial *info,
+                                      struct etrax_dma_descr *descr,
+                                      unsigned int recvl)
 {
         struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer;
 
@@ -2182,8 +2171,7 @@ handle_descr_data(struct e100_serial *info, struct etrax_dma_descr *descr, unsig
         return recvl;
 }
 
-static _INLINE_ unsigned int
-handle_all_descr_data(struct e100_serial *info)
+static unsigned int handle_all_descr_data(struct e100_serial *info)
 {
         struct etrax_dma_descr *descr;
         unsigned int recvl;
@@ -2230,8 +2218,7 @@ handle_all_descr_data(struct e100_serial *info)
         return ret;
 }
 
-static _INLINE_ void
-receive_chars_dma(struct e100_serial *info)
+static void receive_chars_dma(struct e100_serial *info)
 {
         struct tty_struct *tty;
         unsigned char rstat;
@@ -2292,8 +2279,7 @@ receive_chars_dma(struct e100_serial *info)
         *info->icmdadr = IO_STATE(R_DMA_CH6_CMD, cmd, restart);
 }
 
-static _INLINE_ int
-start_recv_dma(struct e100_serial *info)
+static int start_recv_dma(struct e100_serial *info)
 {
         struct etrax_dma_descr *descr = info->rec_descr;
         struct etrax_recv_buffer *buffer;
@@ -2348,11 +2334,6 @@ start_receive(struct e100_serial *info)
 }
 
 
-static _INLINE_ void
-status_handle(struct e100_serial *info, unsigned short status)
-{
-}
-
 /* the bits in the MASK2 register are laid out like this:
    DMAI_EOP DMAI_DESCR DMAO_EOP DMAO_DESCR
    where I is the input channel and O is the output channel for the port.
@@ -2454,8 +2435,7 @@ rec_interrupt(int irq, void *dev_id, struct pt_regs * regs)
         return IRQ_RETVAL(handled);
 } /* rec_interrupt */
 
-static _INLINE_ int
-force_eop_if_needed(struct e100_serial *info)
+static int force_eop_if_needed(struct e100_serial *info)
 {
         /* We check data_avail bit to determine if data has
          * arrived since last time
@@ -2499,8 +2479,7 @@ force_eop_if_needed(struct e100_serial *info)
         return 1;
 }
 
-extern _INLINE_ void
-flush_to_flip_buffer(struct e100_serial *info)
+static void flush_to_flip_buffer(struct e100_serial *info)
 {
         struct tty_struct *tty;
         struct etrax_recv_buffer *buffer;
@@ -2611,8 +2590,7 @@ flush_to_flip_buffer(struct e100_serial *info)
         tty_flip_buffer_push(tty);
 }
 
-static _INLINE_ void
-check_flush_timeout(struct e100_serial *info)
+static void check_flush_timeout(struct e100_serial *info)
 {
         /* Flip what we've got (if we can) */
         flush_to_flip_buffer(info);
@@ -2741,7 +2719,7 @@ TODO: The break will be delayed until an F or V character is received.
 
 */
 
-extern _INLINE_
+static
 struct e100_serial * handle_ser_rx_interrupt_no_dma(struct e100_serial *info)
 {
         unsigned long data_read;
@@ -2875,8 +2853,7 @@ more_data:
         return info;
 }
 
-extern _INLINE_
-struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info)
+static struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info)
 {
         unsigned char rstat;
 
@@ -2995,7 +2972,7 @@ struct e100_serial* handle_ser_rx_interrupt(struct e100_serial *info)
         return info;
 } /* handle_ser_rx_interrupt */
 
-extern _INLINE_ void handle_ser_tx_interrupt(struct e100_serial *info)
+static void handle_ser_tx_interrupt(struct e100_serial *info)
 {
         unsigned long flags;
 
@@ -3621,9 +3598,8 @@ rs_flush_chars(struct tty_struct *tty)
         restore_flags(flags);
 }
 
-extern _INLINE_ int
-rs_raw_write(struct tty_struct * tty, int from_user,
-          const unsigned char *buf, int count)
+static int rs_raw_write(struct tty_struct * tty, int from_user,
+                        const unsigned char *buf, int count)
 {
         int     c, ret = 0;
         struct e100_serial *info = (struct e100_serial *)tty->driver_data;
@@ -4710,7 +4686,7 @@ rs_open(struct tty_struct *tty, struct file * filp)
  * /proc fs routines....
  */
 
-extern _INLINE_ int line_info(char *buf, struct e100_serial *info)
+static int line_info(char *buf, struct e100_serial *info)
 {
         char    stat_buf[30];
         int     ret;
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index ba5541de673b..bf71bad5c34f 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -674,11 +674,12 @@ static void dz_reset(struct dz_port *dport)
 }
 
 #ifdef CONFIG_SERIAL_DZ_CONSOLE
-static void dz_console_put_char(struct dz_port *dport, unsigned char ch)
+static void dz_console_putchar(struct uart_port *port, int ch)
 {
+        struct dz_port *dport = (struct dz_port *)uport;
         unsigned long flags;
         int loops = 2500;
-        unsigned short tmp = ch;
+        unsigned short tmp = (unsigned char)ch;
         /* this code sends stuff out to serial device - spinning its
            wheels and waiting. */
 
@@ -694,6 +695,7 @@ static void dz_console_put_char(struct dz_port *dport, unsigned char ch)
 
         spin_unlock_irqrestore(&dport->port.lock, flags);
 }
+
 /*
  * -------------------------------------------------------------------
  * dz_console_print ()
@@ -710,11 +712,7 @@ static void dz_console_print(struct console *cons,
 #ifdef DEBUG_DZ
         prom_printf((char *) str);
 #endif
-        while (count--) {
-                if (*str == '\n')
-                        dz_console_put_char(dport, '\r');
-                dz_console_put_char(dport, *str++);
-        }
+        uart_console_write(&dport->port, str, count, dz_console_putchar);
 }
 
 static int __init dz_console_setup(struct console *co, char *options)
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 4d53fb5ca87b..c3b7a6673e9c 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -743,6 +743,13 @@ static void __init imx_init_ports(void)
 }
 
 #ifdef CONFIG_SERIAL_IMX_CONSOLE
+static void imx_console_putchar(struct uart_port *port, int ch)
+{
+        struct imx_port *sport = (struct imx_port *)port;
+        while ((UTS((u32)sport->port.membase) & UTS_TXFULL))
+                barrier();
+        URTX0((u32)sport->port.membase) = ch;
+}
 
 /*
  * Interrupts are disabled on entering
@@ -751,7 +758,7 @@ static void
 imx_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct imx_port *sport = &imx_ports[co->index];
-        unsigned int old_ucr1, old_ucr2, i;
+        unsigned int old_ucr1, old_ucr2;
 
         /*
          *      First, save UCR1/2 and then disable interrupts
@@ -764,22 +771,7 @@ imx_console_write(struct console *co, const char *s, unsigned int count)
                            & ~(UCR1_TXMPTYEN | UCR1_RRDYEN | UCR1_RTSDEN);
         UCR2((u32)sport->port.membase) = old_ucr2 | UCR2_TXEN;
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++) {
-
-                while ((UTS((u32)sport->port.membase) & UTS_TXFULL))
-                        barrier();
-
-                URTX0((u32)sport->port.membase) = s[i];
-
-                if (s[i] == '\n') {
-                        while ((UTS((u32)sport->port.membase) & UTS_TXFULL))
-                                barrier();
-                        URTX0((u32)sport->port.membase) = '\r';
-                }
-        }
+        uart_console_write(&sport->port, s, count, imx_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index 193722d680cf..651772474ac1 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -967,8 +967,9 @@ static struct zilog_layout * __init get_zs(int chip)
 #define ZS_PUT_CHAR_MAX_DELAY   2000    /* 10 ms */
 
 #ifdef CONFIG_SERIAL_IP22_ZILOG_CONSOLE
-static void ip22zilog_put_char(struct zilog_channel *channel, unsigned char ch)
+static void ip22zilog_put_char(struct uart_port *port, int ch)
 {
+        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
         int loops = ZS_PUT_CHAR_MAX_DELAY;
 
         /* This is a timed polling loop so do not switch the explicit
@@ -992,16 +993,10 @@ static void
 ip22zilog_console_write(struct console *con, const char *s, unsigned int count)
 {
         struct uart_ip22zilog_port *up = &ip22zilog_port_table[con->index];
-        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
         unsigned long flags;
-        int i;
 
         spin_lock_irqsave(&up->port.lock, flags);
-        for (i = 0; i < count; i++, s++) {
-                ip22zilog_put_char(channel, *s);
-                if (*s == 10)
-                        ip22zilog_put_char(channel, 13);
-        }
+        uart_console_write(&up->port, s, count, ip22zilog_put_char);
         udelay(2);
         spin_unlock_irqrestore(&up->port.lock, flags);
 }
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index 242a04104393..e9c10c0a30fc 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -248,17 +248,17 @@ static void sio_error(int *status)
 
 #endif /* CONFIG_SERIAL_M32R_PLDSIO */
 
-static _INLINE_ unsigned int sio_in(struct uart_sio_port *up, int offset)
+static unsigned int sio_in(struct uart_sio_port *up, int offset)
 {
         return __sio_in(up->port.iobase + offset);
 }
 
-static _INLINE_ void sio_out(struct uart_sio_port *up, int offset, int value)
+static void sio_out(struct uart_sio_port *up, int offset, int value)
 {
         __sio_out(value, up->port.iobase + offset);
 }
 
-static _INLINE_ unsigned int serial_in(struct uart_sio_port *up, int offset)
+static unsigned int serial_in(struct uart_sio_port *up, int offset)
 {
         if (!offset)
                 return 0;
@@ -266,8 +266,7 @@ static _INLINE_ unsigned int serial_in(struct uart_sio_port *up, int offset)
         return __sio_in(offset);
 }
 
-static _INLINE_ void
-serial_out(struct uart_sio_port *up, int offset, int value)
+static void serial_out(struct uart_sio_port *up, int offset, int value)
 {
         if (!offset)
                 return;
@@ -326,8 +325,8 @@ static void m32r_sio_enable_ms(struct uart_port *port)
         serial_out(up, UART_IER, up->ier);
 }
 
-static _INLINE_ void receive_chars(struct uart_sio_port *up, int *status,
-        struct pt_regs *regs)
+static void receive_chars(struct uart_sio_port *up, int *status,
+                          struct pt_regs *regs)
 {
         struct tty_struct *tty = up->port.info->tty;
         unsigned char ch;
@@ -400,7 +399,7 @@ static _INLINE_ void receive_chars(struct uart_sio_port *up, int *status,
         tty_flip_buffer_push(tty);
 }
 
-static _INLINE_ void transmit_chars(struct uart_sio_port *up)
+static void transmit_chars(struct uart_sio_port *up)
 {
         struct circ_buf *xmit = &up->port.info->xmit;
         int count;
@@ -1039,6 +1038,14 @@ static inline void wait_for_xmitr(struct uart_sio_port *up)
         }
 }
 
+static void m32r_sio_console_putchar(struct uart_port *port, int ch)
+{
+        struct uart_sio_port *up = (struct uart_sio_port *)port;
+
+        wait_for_xmitr(up);
+        sio_out(up, SIOTXB, ch);
+}
+
 /*
  *      Print a string to the serial port trying not to disturb
  *      any possible real use of the port...
@@ -1058,23 +1065,7 @@ static void m32r_sio_console_write(struct console *co, const char *s,
         ier = sio_in(up, SIOTRCR);
         sio_out(up, SIOTRCR, 0);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++, s++) {
-                wait_for_xmitr(up);
-
-                /*
-                 *      Send the character out.
-                 *      If a LF, also do CR...
-                 */
-                sio_out(up, SIOTXB, *s);
-
-                if (*s == 10) {
-                        wait_for_xmitr(up);
-                        sio_out(up, SIOTXB, 13);
-                }
-        }
+        uart_console_write(&up->port, s, count, m32r_sio_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 61dd17d7bace..928e6cf12dca 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -603,15 +603,14 @@ mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
                 udelay(1);
 
         /* Write all the chars */
-        for ( i=0 ; i<count ; i++ ) {
-        
-                /* Send the char */
-                out_8(&psc->mpc52xx_psc_buffer_8, *s);
-
+        for (i = 0; i < count; i++, s++) {
                 /* Line return handling */
-                if ( *s++ == '\n' )
+                if (*s == '\n')
                         out_8(&psc->mpc52xx_psc_buffer_8, '\r');
                 
+                /* Send the char */
+                out_8(&psc->mpc52xx_psc_buffer_8, *s);
+
                 /* Wait the TX buffer to be empty */
                 j = 20000;      /* Maximum wait */      
                 while (!(in_be16(&psc->mpc52xx_psc_status) & 
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 9b7ed58cb53b..513ff8597707 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1916,6 +1916,16 @@ static void __exit exit_pmz(void)
 
 #ifdef CONFIG_SERIAL_PMACZILOG_CONSOLE
 
+static void pmz_console_putchar(struct uart_port *port, int ch)
+{
+        struct uart_pmac_port *uap = (struct uart_pmac_port *)port;
+
+        /* Wait for the transmit buffer to empty. */
+        while ((read_zsreg(uap, R0) & Tx_BUF_EMP) == 0)
+                udelay(5);
+        write_zsdata(uap, ch);
+}
+
 /*
  * Print a string to the serial port trying not to disturb
  * any possible real use of the port...
@@ -1924,7 +1934,6 @@ static void pmz_console_write(struct console *con, const char *s, unsigned int c
 {
         struct uart_pmac_port *uap = &pmz_ports[con->index];
         unsigned long flags;
-        int i;
 
         if (ZS_IS_ASLEEP(uap))
                 return;
@@ -1934,17 +1943,7 @@ static void pmz_console_write(struct console *con, const char *s, unsigned int c
         write_zsreg(uap, R1, uap->curregs[1] & ~TxINT_ENAB);
         write_zsreg(uap, R5, uap->curregs[5] | TxENABLE | RTS | DTR);
 
-        for (i = 0; i < count; i++) {
-                /* Wait for the transmit buffer to empty. */
-                while ((read_zsreg(uap, R0) & Tx_BUF_EMP) == 0)
-                        udelay(5);
-                write_zsdata(uap, s[i]);
-                if (s[i] == 10) {
-                        while ((read_zsreg(uap, R0) & Tx_BUF_EMP) == 0)
-                                udelay(5);
-                        write_zsdata(uap, R13);
-                }
-        }
+        uart_console_write(&uap->port, s, count, pmz_console_putchar);
 
         /* Restore the values in the registers. */
         write_zsreg(uap, R1, uap->curregs[1]);
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 10535f00301f..77d4568ccc3a 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -619,6 +619,14 @@ static inline void wait_for_xmitr(struct uart_pxa_port *up)
         }
 }
 
+static void serial_pxa_console_putchar(struct uart_port *port, int ch)
+{
+        struct uart_pxa_port *up = (struct uart_pxa_port *)port;
+
+        wait_for_xmitr(up);
+        serial_out(up, UART_TX, ch);
+}
+
 /*
  * Print a string to the serial port trying not to disturb
  * any possible real use of the port...
@@ -630,7 +638,6 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_pxa_port *up = &serial_pxa_ports[co->index];
         unsigned int ier;
-        int i;
 
         /*
          *      First save the IER then disable the interrupts
@@ -638,22 +645,7 @@ serial_pxa_console_write(struct console *co, const char *s, unsigned int count)
         ier = serial_in(up, UART_IER);
         serial_out(up, UART_IER, UART_IER_UUE);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++, s++) {
-                wait_for_xmitr(up);
-
-                /*
-                 *      Send the character out.
-                 *      If a LF, also do CR...
-                 */
-                serial_out(up, UART_TX, *s);
-                if (*s == 10) {
-                        wait_for_xmitr(up);
-                        serial_out(up, UART_TX, 13);
-                }
-        }
+        uart_console_write(&up->port, s, count, serial_pxa_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 7410e093a6b9..f5aac92fb798 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -1066,6 +1066,8 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
         port->mapbase   = res->start;
         port->membase   = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART);
         port->irq       = platform_get_irq(platdev, 0);
+        if (port->irq < 0)
+                port->irq = 0;
 
         ourport->clk    = clk_get(&platdev->dev, "uart");
 
@@ -1584,25 +1586,19 @@ s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
 }
 
 static void
-s3c24xx_serial_console_write(struct console *co, const char *s,
-                             unsigned int count)
+s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
 {
-        int i;
         unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
+        while (!s3c24xx_serial_console_txrdy(port, ufcon))
+                barrier();
+        wr_regb(cons_uart, S3C2410_UTXH, ch);
+}
 
-        for (i = 0; i < count; i++) {
-                while (!s3c24xx_serial_console_txrdy(cons_uart, ufcon))
-                        barrier();
-
-                wr_regb(cons_uart, S3C2410_UTXH, s[i]);
-
-                if (s[i] == '\n') {
-                        while (!s3c24xx_serial_console_txrdy(cons_uart, ufcon))
-                                barrier();
-
-                        wr_regb(cons_uart, S3C2410_UTXH, '\r');
-                }
-        }
+static void
+s3c24xx_serial_console_write(struct console *co, const char *s,
+                             unsigned int count)
+{
+        uart_console_write(cons_uart, s, count, s3c24xx_serial_console_putchar);
 }
 
 static void __init
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 2c00b8625852..c2d9068b491d 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -689,6 +689,14 @@ void __init sa1100_register_uart(int idx, int port)
 
 
 #ifdef CONFIG_SERIAL_SA1100_CONSOLE
+static void sa1100_console_putchar(struct uart_port *port, int ch)
+{
+        struct sa1100_port *sport = (struct sa1100_port *)port;
+
+        while (!(UART_GET_UTSR1(sport) & UTSR1_TNF))
+                barrier();
+        UART_PUT_CHAR(sport, ch);
+}
 
 /*
  * Interrupts are disabled on entering
@@ -697,7 +705,7 @@ static void
 sa1100_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct sa1100_port *sport = &sa1100_ports[co->index];
-        unsigned int old_utcr3, status, i;
+        unsigned int old_utcr3, status;
 
         /*
          *      First, save UTCR3 and then disable interrupts
@@ -706,21 +714,7 @@ sa1100_console_write(struct console *co, const char *s, unsigned int count)
         UART_PUT_UTCR3(sport, (old_utcr3 & ~(UTCR3_RIE | UTCR3_TIE)) |
                                 UTCR3_TXE);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++) {
-                do {
-                        status = UART_GET_UTSR1(sport);
-                } while (!(status & UTSR1_TNF));
-                UART_PUT_CHAR(sport, s[i]);
-                if (s[i] == '\n') {
-                        do {
-                                status = UART_GET_UTSR1(sport);
-                        } while (!(status & UTSR1_TNF));
-                        UART_PUT_CHAR(sport, '\r');
-                }
-        }
+        uart_console_write(&sport->port, s, count, sa1100_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index cc1faa31d124..fcd7744c4253 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1755,6 +1755,27 @@ static int uart_read_proc(char *page, char **start, off_t off,
 
 #ifdef CONFIG_SERIAL_CORE_CONSOLE
 /*
+ *      uart_console_write - write a console message to a serial port
+ *      @port: the port to write the message
+ *      @s: array of characters
+ *      @count: number of characters in string to write
+ *      @write: function to write character to port
+ */
+void uart_console_write(struct uart_port *port, const char *s,
+                        unsigned int count,
+                        void (*putchar)(struct uart_port *, int))
+{
+        unsigned int i;
+
+        for (i = 0; i < count; i++, s++) {
+                if (*s == '\n')
+                        putchar(port, '\r');
+                putchar(port, *s);
+        }
+}
+EXPORT_SYMBOL_GPL(uart_console_write);
+
+/*
  *      Check whether an invalid uart number has been specified, and
  *      if so, search for the first available port that does have
  *      console support.
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c
index 04186eaae227..aa521b8e0d4e 100644
--- a/drivers/serial/serial_lh7a40x.c
+++ b/drivers/serial/serial_lh7a40x.c
@@ -543,6 +543,12 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
 #else
 # define LH7A40X_CONSOLE &lh7a40x_console
 
+static void lh7a40xuart_console_putchar(struct uart_port *port, int ch)
+{
+        while (UR(port, UART_R_STATUS) & nTxRdy)
+                ;
+        UR(port, UART_R_DATA) = ch;
+}
 
 static void lh7a40xuart_console_write (struct console* co,
                                        const char* s,
@@ -556,16 +562,7 @@ static void lh7a40xuart_console_write (struct console* co,
         UR (port, UART_R_INTEN) = 0;            /* Disable all interrupts */
         BIT_SET (port, UART_R_CON, UARTEN | SIRDIS); /* Enable UART */
 
-        for (; count-- > 0; ++s) {
-                while (UR (port, UART_R_STATUS) & nTxRdy)
-                        ;
-                UR (port, UART_R_DATA) = *s;
-                if (*s == '\n') {
-                        while ((UR (port, UART_R_STATUS) & TxBusy))
-                                ;
-                        UR (port, UART_R_DATA) = '\r';
-                }
-        }
+        uart_console_write(port, s, count, lh7a40xuart_console_putchar);
 
                                 /* Wait until all characters are sent */
         while (UR (port, UART_R_STATUS) & TxBusy)
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index ee98a867bc6d..b848b7d94412 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -33,6 +33,10 @@
  *      1.02    Cleanup. (import 8250.c changes)
  *      1.03    Fix low-latency mode. (import 8250.c changes)
  *      1.04    Remove usage of deprecated functions, cleanup.
+ *      1.05    More strict check in verify_port.  Cleanup.
+ *      1.06    Do not insert a char caused previous overrun.
+ *              Fix some spin_locks.
+ *              Do not call uart_add_one_port for absent ports.
  */
 #include <linux/config.h>
 
@@ -57,7 +61,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-static char *serial_version = "1.04";
+static char *serial_version = "1.06";
 static char *serial_name = "TX39/49 Serial driver";
 
 #define PASS_LIMIT      256
@@ -94,6 +98,8 @@ static char *serial_name = "TX39/49 Serial driver";
 #define UART_NR  4
 #endif
 
+#define HIGH_BITS_OFFSET        ((sizeof(long)-sizeof(int))*8)
+
 struct uart_txx9_port {
         struct uart_port        port;
 
@@ -210,7 +216,7 @@ static inline unsigned int sio_in(struct uart_txx9_port *up, int offset)
 {
         switch (up->port.iotype) {
         default:
-                return *(volatile u32 *)(up->port.membase + offset);
+                return __raw_readl(up->port.membase + offset);
         case UPIO_PORT:
                 return inl(up->port.iobase + offset);
         }
@@ -221,7 +227,7 @@ sio_out(struct uart_txx9_port *up, int offset, int value)
 {
         switch (up->port.iotype) {
         default:
-                *(volatile u32 *)(up->port.membase + offset) = value;
+                __raw_writel(value, up->port.membase + offset);
                 break;
         case UPIO_PORT:
                 outl(value, up->port.iobase + offset);
@@ -259,34 +265,19 @@ sio_quot_set(struct uart_txx9_port *up, int quot)
 static void serial_txx9_stop_tx(struct uart_port *port)
 {
         struct uart_txx9_port *up = (struct uart_txx9_port *)port;
-        unsigned long flags;
-
-        spin_lock_irqsave(&up->port.lock, flags);
         sio_mask(up, TXX9_SIDICR, TXX9_SIDICR_TIE);
-        spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
 static void serial_txx9_start_tx(struct uart_port *port)
 {
         struct uart_txx9_port *up = (struct uart_txx9_port *)port;
-        unsigned long flags;
-
-        spin_lock_irqsave(&up->port.lock, flags);
         sio_set(up, TXX9_SIDICR, TXX9_SIDICR_TIE);
-        spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
 static void serial_txx9_stop_rx(struct uart_port *port)
 {
         struct uart_txx9_port *up = (struct uart_txx9_port *)port;
-        unsigned long flags;
-
-        spin_lock_irqsave(&up->port.lock, flags);
         up->port.read_status_mask &= ~TXX9_SIDISR_RDIS;
-#if 0
-        sio_mask(up, TXX9_SIDICR, TXX9_SIDICR_RIE);
-#endif
-        spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
 static void serial_txx9_enable_ms(struct uart_port *port)
@@ -302,12 +293,16 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status, struct pt_regs *r
         unsigned int disr = *status;
         int max_count = 256;
         char flag;
+        unsigned int next_ignore_status_mask;
 
         do {
                 ch = sio_in(up, TXX9_SIRFIFO);
                 flag = TTY_NORMAL;
                 up->port.icount.rx++;
 
+                /* mask out RFDN_MASK bit added by previous overrun */
+                next_ignore_status_mask =
+                        up->port.ignore_status_mask & ~TXX9_SIDISR_RFDN_MASK;
                 if (unlikely(disr & (TXX9_SIDISR_UBRK | TXX9_SIDISR_UPER |
                                      TXX9_SIDISR_UFER | TXX9_SIDISR_UOER))) {
                         /*
@@ -328,8 +323,17 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status, struct pt_regs *r
                                 up->port.icount.parity++;
                         else if (disr & TXX9_SIDISR_UFER)
                                 up->port.icount.frame++;
-                        if (disr & TXX9_SIDISR_UOER)
+                        if (disr & TXX9_SIDISR_UOER) {
                                 up->port.icount.overrun++;
+                                /*
+                                 * The receiver read buffer still hold
+                                 * a char which caused overrun.
+                                 * Ignore next char by adding RFDN_MASK
+                                 * to ignore_status_mask temporarily.
+                                 */
+                                next_ignore_status_mask |=
+                                        TXX9_SIDISR_RFDN_MASK;
+                        }
 
                         /*
                          * Mask off conditions which should be ingored.
@@ -349,6 +353,7 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status, struct pt_regs *r
                 uart_insert_char(&up->port, disr, TXX9_SIDISR_UOER, ch, flag);
 
         ignore_char:
+                up->port.ignore_status_mask = next_ignore_status_mask;
                 disr = sio_in(up, TXX9_SIDISR);
         } while (!(disr & TXX9_SIDISR_UVALID) && (max_count-- > 0));
         spin_unlock(&up->port.lock);
@@ -450,14 +455,11 @@ static unsigned int serial_txx9_get_mctrl(struct uart_port *port)
 static void serial_txx9_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
         struct uart_txx9_port *up = (struct uart_txx9_port *)port;
-        unsigned long flags;
 
-        spin_lock_irqsave(&up->port.lock, flags);
         if (mctrl & TIOCM_RTS)
                 sio_mask(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSSC);
         else
                 sio_set(up, TXX9_SIFLCR, TXX9_SIFLCR_RTSSC);
-        spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
 static void serial_txx9_break_ctl(struct uart_port *port, int break_state)
@@ -784,8 +786,14 @@ static void serial_txx9_config_port(struct uart_port *port, int uflags)
 static int
 serial_txx9_verify_port(struct uart_port *port, struct serial_struct *ser)
 {
-        if (ser->irq < 0 ||
-            ser->baud_base < 9600 || ser->type != PORT_TXX9)
+        unsigned long new_port = ser->port;
+        if (HIGH_BITS_OFFSET)
+                new_port += (unsigned long)ser->port_high << HIGH_BITS_OFFSET;
+        if (ser->type != port->type ||
+            ser->irq != port->irq ||
+            ser->io_type != port->iotype ||
+            new_port != port->iobase ||
+            (unsigned long)ser->iomem_base != port->mapbase)
                 return -EINVAL;
         return 0;
 }
@@ -827,7 +835,8 @@ static void __init serial_txx9_register_ports(struct uart_driver *drv)
 
                 up->port.line = i;
                 up->port.ops = &serial_txx9_pops;
-                uart_add_one_port(drv, &up->port);
+                if (up->port.iobase || up->port.mapbase)
+                        uart_add_one_port(drv, &up->port);
         }
 }
 
@@ -854,6 +863,14 @@ static inline void wait_for_xmitr(struct uart_txx9_port *up)
         }
 }
 
+static void serial_txx9_console_putchar(struct uart_port *port, int ch)
+{
+        struct uart_txx9_port *up = (struct uart_txx9_port *)port;
+
+        wait_for_xmitr(up);
+        sio_out(up, TXX9_SITFIFO, ch);
+}
+
 /*
  *      Print a string to the serial port trying not to disturb
  *      any possible real use of the port...
@@ -865,7 +882,6 @@ serial_txx9_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct uart_txx9_port *up = &serial_txx9_ports[co->index];
         unsigned int ier, flcr;
-        int i;
 
         /*
          *      First save the UER then disable the interrupts
@@ -879,22 +895,7 @@ serial_txx9_console_write(struct console *co, const char *s, unsigned int count)
         if (!(up->port.flags & UPF_CONS_FLOW) && (flcr & TXX9_SIFLCR_TES))
                 sio_out(up, TXX9_SIFLCR, flcr & ~TXX9_SIFLCR_TES);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++, s++) {
-                wait_for_xmitr(up);
-
-                /*
-                 *      Send the character out.
-                 *      If a LF, also do CR...
-                 */
-                sio_out(up, TXX9_SITFIFO, *s);
-                if (*s == 10) {
-                        wait_for_xmitr(up);
-                        sio_out(up, TXX9_SITFIFO, 13);
-                }
-        }
+        uart_console_write(&up->port, s, count, serial_txx9_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
@@ -927,11 +928,6 @@ static int serial_txx9_console_setup(struct console *co, char *options)
                 return -ENODEV;
 
         /*
-         * Temporary fix.
-         */
-        spin_lock_init(&port->lock);
-
-        /*
          *      Disable UART interrupts, set DTR and RTS high
          *      and set speed.
          */
@@ -1041,11 +1037,10 @@ static int __devinit serial_txx9_register_port(struct uart_port *port)
         mutex_lock(&serial_txx9_mutex);
         for (i = 0; i < UART_NR; i++) {
                 uart = &serial_txx9_ports[i];
-                if (uart->port.type == PORT_UNKNOWN)
+                if (!(uart->port.iobase || uart->port.mapbase))
                         break;
         }
         if (i < UART_NR) {
-                uart_remove_one_port(&serial_txx9_reg, &uart->port);
                 uart->port.iobase = port->iobase;
                 uart->port.membase = port->membase;
                 uart->port.irq      = port->irq;
@@ -1080,9 +1075,8 @@ static void __devexit serial_txx9_unregister_port(int line)
         uart->port.type = PORT_UNKNOWN;
         uart->port.iobase = 0;
         uart->port.mapbase = 0;
-        uart->port.membase = 0;
+        uart->port.membase = NULL;
         uart->port.dev = NULL;
-        uart_add_one_port(&serial_txx9_reg, &uart->port);
         mutex_unlock(&serial_txx9_mutex);
 }
 
@@ -1198,8 +1192,11 @@ static void __exit serial_txx9_exit(void)
 #ifdef ENABLE_SERIAL_TXX9_PCI
         pci_unregister_driver(&serial_txx9_pci_driver);
 #endif
-        for (i = 0; i < UART_NR; i++)
-                uart_remove_one_port(&serial_txx9_reg, &serial_txx9_ports[i].port);
+        for (i = 0; i < UART_NR; i++) {
+                struct uart_txx9_port *up = &serial_txx9_ports[i];
+                if (up->port.iobase || up->port.mapbase)
+                        uart_remove_one_port(&serial_txx9_reg, &up->port);
+        }
 
         uart_unregister_driver(&serial_txx9_reg);
 }
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index a2fb0c2fb121..bfbe9dc90cca 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -861,8 +861,9 @@ static int num_channels;
 
 #ifdef CONFIG_SERIAL_SUNSAB_CONSOLE
 
-static __inline__ void sunsab_console_putchar(struct uart_sunsab_port *up, char c)
+static void sunsab_console_putchar(struct uart_port *port, int c)
 {
+        struct uart_sunsab_port *up = (struct uart_sunsab_port *)port;
         unsigned long flags;
 
         spin_lock_irqsave(&up->port.lock, flags);
@@ -876,13 +877,8 @@ static __inline__ void sunsab_console_putchar(struct uart_sunsab_port *up, char
 static void sunsab_console_write(struct console *con, const char *s, unsigned n)
 {
         struct uart_sunsab_port *up = &sunsab_ports[con->index];
-        int i;
 
-        for (i = 0; i < n; i++) {
-                if (*s == '\n')
-                        sunsab_console_putchar(up, '\r');
-                sunsab_console_putchar(up, *s++);
-        }
+        uart_console_write(&up->port, s, n, sunsab_console_putchar);
         sunsab_tec_wait(up);
 }
 
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 46c44b83f57c..9fe2283d91e5 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -102,9 +102,7 @@ struct uart_sunsu_port {
 #endif
 };
 
-#define _INLINE_
-
-static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset)
+static unsigned int serial_in(struct uart_sunsu_port *up, int offset)
 {
         offset <<= up->port.regshift;
 
@@ -121,8 +119,7 @@ static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset)
         }
 }
 
-static _INLINE_ void
-serial_out(struct uart_sunsu_port *up, int offset, int value)
+static void serial_out(struct uart_sunsu_port *up, int offset, int value)
 {
 #ifndef CONFIG_SPARC64
         /*
@@ -316,7 +313,7 @@ static void sunsu_enable_ms(struct uart_port *port)
         spin_unlock_irqrestore(&up->port.lock, flags);
 }
 
-static _INLINE_ struct tty_struct *
+static struct tty_struct *
 receive_chars(struct uart_sunsu_port *up, unsigned char *status, struct pt_regs *regs)
 {
         struct tty_struct *tty = up->port.info->tty;
@@ -395,7 +392,7 @@ receive_chars(struct uart_sunsu_port *up, unsigned char *status, struct pt_regs
         return tty;
 }
 
-static _INLINE_ void transmit_chars(struct uart_sunsu_port *up)
+static void transmit_chars(struct uart_sunsu_port *up)
 {
         struct circ_buf *xmit = &up->port.info->xmit;
         int count;
@@ -431,7 +428,7 @@ static _INLINE_ void transmit_chars(struct uart_sunsu_port *up)
                 __stop_tx(up);
 }
 
-static _INLINE_ void check_modem_status(struct uart_sunsu_port *up)
+static void check_modem_status(struct uart_sunsu_port *up)
 {
         int status;
 
@@ -1377,6 +1374,14 @@ static __inline__ void wait_for_xmitr(struct uart_sunsu_port *up)
         }
 }
 
+static void sunsu_console_putchar(struct uart_port *port, int ch)
+{
+        struct uart_sunsu_port *up = (struct uart_sunsu_port *)port;
+
+        wait_for_xmitr(up);
+        serial_out(up, UART_TX, ch);
+}
+
 /*
  *      Print a string to the serial port trying not to disturb
  *      any possible real use of the port...
@@ -1386,7 +1391,6 @@ static void sunsu_console_write(struct console *co, const char *s,
 {
         struct uart_sunsu_port *up = &sunsu_ports[co->index];
         unsigned int ier;
-        int i;
 
         /*
          *      First save the UER then disable the interrupts
@@ -1394,22 +1398,7 @@ static void sunsu_console_write(struct console *co, const char *s,
         ier = serial_in(up, UART_IER);
         serial_out(up, UART_IER, 0);
 
-        /*
-         *      Now, do each character
-         */
-        for (i = 0; i < count; i++, s++) {
-                wait_for_xmitr(up);
-
-                /*
-                 *      Send the character out.
-                 *      If a LF, also do CR...
-                 */
-                serial_out(up, UART_TX, *s);
-                if (*s == 10) {
-                        wait_for_xmitr(up);
-                        serial_out(up, UART_TX, 13);
-                }
-        }
+        uart_console_write(&up->port, s, count, sunsu_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 10b35c6f287d..cd49ebbf4a45 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1252,8 +1252,9 @@ static struct zilog_layout __iomem * __init get_zs(int chip, int node)
 
 #define ZS_PUT_CHAR_MAX_DELAY   2000    /* 10 ms */
 
-static void sunzilog_put_char(struct zilog_channel __iomem *channel, unsigned char ch)
+static void sunzilog_putchar(struct uart_port *port, int ch)
 {
+        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
         int loops = ZS_PUT_CHAR_MAX_DELAY;
 
         /* This is a timed polling loop so do not switch the explicit
@@ -1284,7 +1285,7 @@ static int sunzilog_serio_write(struct serio *serio, unsigned char ch)
 
         spin_lock_irqsave(&sunzilog_serio_lock, flags);
 
-        sunzilog_put_char(ZILOG_CHANNEL_FROM_PORT(&up->port), ch);
+        sunzilog_putchar(&up->port, ch);
 
         spin_unlock_irqrestore(&sunzilog_serio_lock, flags);
 
@@ -1325,16 +1326,10 @@ static void
 sunzilog_console_write(struct console *con, const char *s, unsigned int count)
 {
         struct uart_sunzilog_port *up = &sunzilog_port_table[con->index];
-        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(&up->port);
         unsigned long flags;
-        int i;
 
         spin_lock_irqsave(&up->port.lock, flags);
-        for (i = 0; i < count; i++, s++) {
-                sunzilog_put_char(channel, *s);
-                if (*s == 10)
-                        sunzilog_put_char(channel, 13);
-        }
+        uart_console_write(&up->port, s, count, sunzilog_putchar);
         udelay(2);
         spin_unlock_irqrestore(&up->port.lock, flags);
 }
diff --git a/drivers/serial/vr41xx_siu.c b/drivers/serial/vr41xx_siu.c
index d61494d185cd..df5e8713fa31 100644
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
@@ -821,25 +821,23 @@ static void wait_for_xmitr(struct uart_port *port)
         }
 }
 
+static void siu_console_putchar(struct uart_port *port, int ch)
+{
+        wait_for_xmitr(port);
+        siu_write(port, UART_TX, ch);
+}
+
 static void siu_console_write(struct console *con, const char *s, unsigned count)
 {
         struct uart_port *port;
         uint8_t ier;
-        unsigned i;
 
         port = &siu_uart_ports[con->index];
 
         ier = siu_read(port, UART_IER);
         siu_write(port, UART_IER, 0);
 
-        for (i = 0; i < count && *s != '\0'; i++, s++) {
-                wait_for_xmitr(port);
-                siu_write(port, UART_TX, *s);
-                if (*s == '\n') {
-                        wait_for_xmitr(port);
-                        siu_write(port, UART_TX, '\r');
-                }
-        }
+        uart_console_write(port, s, count, siu_console_putchar);
 
         wait_for_xmitr(port);
         siu_write(port, UART_IER, ier);
@@ -919,7 +917,7 @@ static struct uart_driver siu_uart_driver = {
         .cons           = SERIAL_VR41XX_CONSOLE,
 };
 
-static int siu_probe(struct platform_device *dev)
+static int __devinit siu_probe(struct platform_device *dev)
 {
         struct uart_port *port;
         int num, i, retval;
@@ -953,7 +951,7 @@ static int siu_probe(struct platform_device *dev)
         return 0;
 }
 
-static int siu_remove(struct platform_device *dev)
+static int __devexit siu_remove(struct platform_device *dev)
 {
         struct uart_port *port;
         int i;
@@ -1006,21 +1004,28 @@ static struct platform_device *siu_platform_device;
 
 static struct platform_driver siu_device_driver = {
         .probe          = siu_probe,
-        .remove         = siu_remove,
+        .remove         = __devexit_p(siu_remove),
         .suspend        = siu_suspend,
         .resume         = siu_resume,
         .driver         = {
                 .name   = "SIU",
+                .owner  = THIS_MODULE,
         },
 };
 
-static int __devinit vr41xx_siu_init(void)
+static int __init vr41xx_siu_init(void)
 {
         int retval;
 
-        siu_platform_device = platform_device_register_simple("SIU", -1, NULL, 0);
-        if (IS_ERR(siu_platform_device))
-                return PTR_ERR(siu_platform_device);
+        siu_platform_device = platform_device_alloc("SIU", -1);
+        if (!siu_platform_device)
+                return -ENOMEM;
+
+        retval = platform_device_add(siu_platform_device);
+        if (retval < 0) {
+                platform_device_put(siu_platform_device);
+                return retval;
+        }
 
         retval = platform_driver_register(&siu_device_driver);
         if (retval < 0)
@@ -1029,10 +1034,9 @@ static int __devinit vr41xx_siu_init(void)
         return retval;
 }
 
-static void __devexit vr41xx_siu_exit(void)
+static void __exit vr41xx_siu_exit(void)
 {
         platform_driver_unregister(&siu_device_driver);
-
         platform_device_unregister(siu_platform_device);
 }