Merge git://git.denx.de/u-boot-dm

[u-boot] / arch / powerpc / cpu / mpc85xx / serial_scc.c

diff --git a/arch/powerpc/cpu/mpc85xx/serial_scc.c b/arch/powerpc/cpu/mpc85xx/serial_scc.c
index fe9af55c7a564030041869ceb82e33f89e880e0a..faba6421f93deef5aac19497fcfc2423f171d6ec 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/serial_scc.c
+++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c
@@ -6,23 +6,7 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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+
  *
  * Hacked for MPC8260 by Murray.Jensen@cmst.csiro.au, 19-Oct-00.
  */
@@ -220,13 +204,6 @@ static void mpc85xx_serial_putc(const char c)
        tbdf->cbd_sc |= BD_SC_READY;
 }
 
-static void mpc85xx_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
 static int mpc85xx_serial_getc(void)
 {
        volatile cbd_t          *rbdf;
@@ -268,7 +245,7 @@ static struct serial_device mpc85xx_serial_drv = {
        .stop   = NULL,
        .setbrg = mpc85xx_serial_setbrg,
        .putc   = mpc85xx_serial_putc,
-       .puts   = mpc85xx_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = mpc85xx_serial_getc,
        .tstc   = mpc85xx_serial_tstc,
 };