[MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.

early_printk is a so much saner thing.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

4 files changed, 14 insertions, 43 deletions

diff --git a/arch/mips/arc/console.c b/arch/mips/arc/console.c
index 6a9d144512c0..0fe6032999cb 100644
--- a/arch/mips/arc/console.c
+++ b/arch/mips/arc/console.c
@@ -29,35 +29,3 @@ void prom_putchar(char c)
         ArcWrite(1, &it, 1, &cnt);
         bc_enable();
 }
-
-char prom_getchar(void)
-{
-        ULONG cnt;
-        CHAR c;
-
-        bc_disable();
-        ArcRead(0, &c, 1, &cnt);
-        bc_enable();
-
-        return c;
-}
-
-void prom_printf(char *fmt, ...)
-{
-        va_list args;
-        char ppbuf[1024];
-        char *bptr;
-
-        va_start(args, fmt);
-        vsprintf(ppbuf, fmt, args);
-
-        bptr = ppbuf;
-
-        while (*bptr != 0) {
-                if (*bptr == '\n')
-                        prom_putchar('\r');
-
-                prom_putchar(*bptr++);
-        }
-        va_end(args);
-}
diff --git a/arch/mips/arc/init.c b/arch/mips/arc/init.c
index 76ab505ca693..0ac8f42d3752 100644
--- a/arch/mips/arc/init.c
+++ b/arch/mips/arc/init.c
@@ -24,12 +24,15 @@ void __init prom_init(void)
 {
         PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK;
         romvec = ROMVECTOR;
+        ULONG cnt;
+        CHAR c;
+
         prom_argc = fw_arg0;
         _prom_argv = (LONG *) fw_arg1;
         _prom_envp = (LONG *) fw_arg2;
 
         if (pb->magic != 0x53435241) {
-                prom_printf("Aieee, bad prom vector magic %08lx\n", pb->magic);
+                printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n", pb->magic);
                 while(1)
                         ;
         }
@@ -41,8 +44,8 @@ void __init prom_init(void)
         prom_meminit();
 
 #ifdef DEBUG_PROM_INIT
-        prom_printf("Press a key to reboot\n");
-        prom_getchar();
+        pr_info("Press a key to reboot\n");
+        ArcRead(0, &c, 1, &cnt);
         ArcEnterInteractiveMode();
 #endif
 }
diff --git a/arch/mips/arc/memory.c b/arch/mips/arc/memory.c
index 456cb81a32d9..83d15791ef6a 100644
--- a/arch/mips/arc/memory.c
+++ b/arch/mips/arc/memory.c
@@ -118,11 +118,11 @@ void __init prom_meminit(void)
 #ifdef DEBUG
         int i = 0;
 
-        prom_printf("ARCS MEMORY DESCRIPTOR dump:\n");
+        printk("ARCS MEMORY DESCRIPTOR dump:\n");
         p = ArcGetMemoryDescriptor(PROM_NULL_MDESC);
         while(p) {
-                prom_printf("[%d,%p]: base<%08lx> pages<%08lx> type<%s>\n",
-                            i, p, p->base, p->pages, mtypes(p->type));
+                printk("[%d,%p]: base<%08lx> pages<%08lx> type<%s>\n",
+                       i, p, p->base, p->pages, mtypes(p->type));
                 p = ArcGetMemoryDescriptor(p);
                 i++;
         }
diff --git a/arch/mips/arc/tree.c b/arch/mips/arc/tree.c
index 2aedd4f52839..abd1786ea09b 100644
--- a/arch/mips/arc/tree.c
+++ b/arch/mips/arc/tree.c
@@ -93,11 +93,11 @@ static char *iflags[] = {
 static void __init
 dump_component(pcomponent *p)
 {
-        prom_printf("[%p]:class<%s>type<%s>flags<%s>ver<%d>rev<%d>",
-                    p, classes[p->class], types[p->type],
-                    iflags[p->iflags], p->vers, p->rev);
-        prom_printf("key<%08lx>\n\tamask<%08lx>cdsize<%d>ilen<%d>iname<%s>\n",
-                    p->key, p->amask, (int)p->cdsize, (int)p->ilen, p->iname);
+        printk("[%p]:class<%s>type<%s>flags<%s>ver<%d>rev<%d>",
+               p, classes[p->class], types[p->type],
+               iflags[p->iflags], p->vers, p->rev);
+        printk("key<%08lx>\n\tamask<%08lx>cdsize<%d>ilen<%d>iname<%s>\n",
+               p->key, p->amask, (int)p->cdsize, (int)p->ilen, p->iname);
 }
 
 static void __init