Merge remote-tracking branch 'u-boot-ti/master'

[platform/kernel/u-boot.git] / drivers / serial / lpc32xx_hsuart.c

diff --git a/drivers/serial/lpc32xx_hsuart.c b/drivers/serial/lpc32xx_hsuart.c
index 536fd46..7559916 100644 (file)
--- a/drivers/serial/lpc32xx_hsuart.c
+++ b/drivers/serial/lpc32xx_hsuart.c
@@ -77,20 +77,13 @@ static int lpc32xx_serial_init(void)
        return 0;
 }
 
-static void lpc32xx_serial_puts(const char *s)
-{
-       while (*s)
-               serial_putc(*s++);
-}
-
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device lpc32xx_serial_drv = {
        .name   = "lpc32xx_serial",
        .start  = lpc32xx_serial_init,
        .stop   = NULL,
        .setbrg = lpc32xx_serial_setbrg,
        .putc   = lpc32xx_serial_putc,
-       .puts   = lpc32xx_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = lpc32xx_serial_getc,
        .tstc   = lpc32xx_serial_tstc,
 };
@@ -104,34 +97,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &lpc32xx_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return lpc32xx_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       lpc32xx_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       lpc32xx_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       lpc32xx_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return lpc32xx_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return lpc32xx_serial_tstc();
-}
-#endif