Merge branch 'next'

[karo-tx-uboot.git] / drivers / serial / altera_uart.c

diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 1d0dd6929c9bec4c7aa61fb9e15b209e81c48845..118cd58ece85e6e6fb9102cb3ec7c78157f3488d 100644 (file)
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -82,13 +82,6 @@ static void altera_serial_putc(char c)
        writel ((unsigned char)c, &uart->txdata);
 }
 
-static void altera_serial_puts(const char *s)
-{
-       while (*s != 0) {
-               serial_putc (*s++);
-       }
-}
-
 static int altera_serial_tstc(void)
 {
        return (readl (&uart->status) & NIOS_UART_RRDY);
@@ -101,14 +94,13 @@ static int altera_serial_getc(void)
        return (readl (&uart->rxdata) & 0x00ff );
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device altera_serial_drv = {
        .name   = "altera_serial",
        .start  = altera_serial_init,
        .stop   = NULL,
        .setbrg = altera_serial_setbrg,
        .putc   = altera_serial_putc,
-       .puts   = altera_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = altera_serial_getc,
        .tstc   = altera_serial_tstc,
 };
@@ -122,34 +114,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &altera_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return altera_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       altera_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       altera_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       altera_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return altera_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return altera_serial_tstc();
-}
-#endif