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

[platform/kernel/u-boot.git] / 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 d192642..6345362 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/serial_scc.c
+++ b/arch/powerpc/cpu/mpc85xx/serial_scc.c
@@ -220,13 +220,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;
@@ -262,14 +255,13 @@ static int mpc85xx_serial_tstc(void)
        return ((rbdf->cbd_sc & BD_SC_EMPTY) == 0);
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device mpc85xx_serial_drv = {
        .name   = "mpc85xx_serial",
        .start  = mpc85xx_serial_init,
        .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,
 };
@@ -283,35 +275,4 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &mpc85xx_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return mpc85xx_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       mpc85xx_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       mpc85xx_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       mpc85xx_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return mpc85xx_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return mpc85xx_serial_tstc();
-}
-#endif
 #endif /* CONFIG_CONS_ON_SCC */