Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / drivers / serial / altera_jtag_uart.c

diff --git a/drivers/serial/altera_jtag_uart.c b/drivers/serial/altera_jtag_uart.c
index 8cb4606d37bbad34cd32a9e4c15a0e8c40d57e73..28319baf187fae15ee030486f34e0c442cf07a2a 100644 (file)
--- a/drivers/serial/altera_jtag_uart.c
+++ b/drivers/serial/altera_jtag_uart.c
@@ -59,12 +59,6 @@ static void altera_jtag_serial_putc(char c)
        writel ((unsigned char)c, &jtag->data);
 }
 
-static void altera_jtag_serial_puts(const char *s)
-{
-       while (*s != 0)
-               serial_putc (*s++);
-}
-
 static int altera_jtag_serial_tstc(void)
 {
        return ( readl (&jtag->control) & NIOS_JTAG_RRDY);
@@ -85,14 +79,13 @@ static int altera_jtag_serial_getc(void)
        return (c);
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device altera_jtag_serial_drv = {
        .name   = "altera_jtag_uart",
        .start  = altera_jtag_serial_init,
        .stop   = NULL,
        .setbrg = altera_jtag_serial_setbrg,
        .putc   = altera_jtag_serial_putc,
-       .puts   = altera_jtag_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = altera_jtag_serial_getc,
        .tstc   = altera_jtag_serial_tstc,
 };
@@ -106,34 +99,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &altera_jtag_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return altera_jtag_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       altera_jtag_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       altera_jtag_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       altera_jtag_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return altera_jtag_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return altera_jtag_serial_tstc();
-}
-#endif