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

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

diff --git a/drivers/serial/serial_sa1100.c b/drivers/serial/serial_sa1100.c
index 86e682d44d4aa788a081275895b43b5b2d5b0b1e..78f241d8508f38d80a82f1aa9f63065a449de51b 100644 (file)
--- a/drivers/serial/serial_sa1100.c
+++ b/drivers/serial/serial_sa1100.c
@@ -12,20 +12,7 @@
  *
  * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl)
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -153,21 +140,13 @@ static int sa1100_serial_getc(void)
 #endif
 }
 
-static void sa1100_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device sa1100_serial_drv = {
        .name   = "sa1100_serial",
        .start  = sa1100_serial_init,
        .stop   = NULL,
        .setbrg = sa1100_serial_setbrg,
        .putc   = sa1100_serial_putc,
-       .puts   = sa1100_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = sa1100_serial_getc,
        .tstc   = sa1100_serial_tstc,
 };
@@ -181,34 +160,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &sa1100_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return sa1100_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       sa1100_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       sa1100_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       sa1100_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return sa1100_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return sa1100_serial_tstc();
-}
-#endif