corvus: remove unneeded CONFIG_AT91_LEGACY

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

diff --git a/drivers/serial/serial_ks8695.c b/drivers/serial/serial_ks8695.c
index b3af388942dcbc736b348339ad2c74ad5f677bbd..13adabd1126767951f46c1834a88a2195050a29f 100644 (file)
--- a/drivers/serial/serial_ks8695.c
+++ b/drivers/serial/serial_ks8695.c
@@ -3,19 +3,7 @@
  *
  * (C) Copyright 2004, Greg Ungerer <greg.ungerer@opengear.com>
  *
- * 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>
@@ -102,13 +90,6 @@ static int ks8695_serial_tstc(void)
        return 0;
 }
 
-static void ks8695_serial_puts(const char *s)
-{
-       char c;
-       while ((c = *s++) != 0)
-               serial_putc(c);
-}
-
 static int ks8695_serial_getc(void)
 {
        volatile struct ks8695uart *uartp = KS8695_UART_ADDR;
@@ -118,14 +99,13 @@ static int ks8695_serial_getc(void)
        return (uartp->RX);
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device ks8695_serial_drv = {
        .name   = "ks8695_serial",
        .start  = ks8695_serial_init,
        .stop   = NULL,
        .setbrg = ks8695_serial_setbrg,
        .putc   = ks8695_serial_putc,
-       .puts   = ks8695_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = ks8695_serial_getc,
        .tstc   = ks8695_serial_tstc,
 };
@@ -139,34 +119,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &ks8695_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return ks8695_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       ks8695_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       ks8695_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       ks8695_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return ks8695_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return ks8695_serial_tstc();
-}
-#endif