usb: add enum usb_init_type parameter to usb_lowlevel_init

[oweals/u-boot.git] / arch / mips / cpu / mips32 / incaip / asc_serial.c

diff --git a/arch/mips/cpu/mips32/incaip/asc_serial.c b/arch/mips/cpu/mips32/incaip/asc_serial.c
index b5f32e2820fe1a9849dcb6e0ad4f9d1d9373c715..6f0e4f2520143a2909ff73585f2d1576b9a276da 100644 (file)
--- a/arch/mips/cpu/mips32/incaip/asc_serial.c
+++ b/arch/mips/cpu/mips32/incaip/asc_serial.c
@@ -236,14 +236,6 @@ static void asc_serial_putc(const char c)
     }
 }
 
-static void asc_serial_puts(const char *s)
-{
-    while (*s)
-    {
-       serial_putc (*s++);
-    }
-}
-
 static int asc_serial_getc(void)
 {
     ulong symbol_mask;
@@ -286,14 +278,13 @@ static int asc_serial_tstc(void)
     return res;
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device asc_serial_drv = {
        .name   = "asc_serial",
        .start  = asc_serial_init,
        .stop   = NULL,
        .setbrg = asc_serial_setbrg,
        .putc   = asc_serial_putc,
-       .puts   = asc_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = asc_serial_getc,
        .tstc   = asc_serial_tstc,
 };
@@ -307,34 +298,3 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &asc_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return asc_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       asc_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       asc_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       asc_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return asc_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return asc_serial_tstc();
-}
-#endif