Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] MTX1: clear PCI errors
  [MIPS] MTX1: add idsel cardbus ressources
  [MIPS] MTX1: remove unneeded settings
  [MIPS] dma_sync_sg_for_cpu is a no-op except for non-coherent R10000s.
  [MIPS] Cobalt: update reserved resources
  [MIPS] SN: PCI fixup needs to include <irq.h>.
  [MIPS] DMA: Fix a bunch of warnings due to missing inline keywords.
  [MIPS] RM: It should be #ifdef CONFIG_FOO not #if CONFIG_FOO ...
  [MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
  [MIPS] DEC: Remove redeclarations of mips_machgroup and mips_machtype.
  [MIPS] No need to write c0_compare in plat_timer_setup
  [MIPS] Convert to RTC-class ds1742 driver
  [MIPS] Oprofile: Add missing break statements.
  [MIPS] jmr3927: build fix
  [MIPS] SNI: Fix mc146818_decode_year
  [MIPS] Replace sys32_timer_create with the generic compat_sys_timer_create.
  [MIPS] Replace sys32_socketcall with the generic compat_sys_socketcall.
  [MIPS] N32 waitid is the same as o32.

1 files changed, 11 insertions, 36 deletions

diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c
index d47692f73a26..812c6ac366be 100644
--- a/arch/mips/lasat/prom.c
+++ b/arch/mips/lasat/prom.c
@@ -23,10 +23,6 @@
 #define PROM_PUTC_ADDR          PROM_JUMP_TABLE_ENTRY(1)
 #define PROM_MONITOR_ADDR       PROM_JUMP_TABLE_ENTRY(2)
 
-static void null_prom_printf(const char * fmt, ...)
-{
-}
-
 static void null_prom_display(const char *string, int pos, int clear)
 {
 }
@@ -40,50 +36,29 @@ static void null_prom_putc(char c)
 }
 
 /* these are functions provided by the bootloader */
-static void (* prom_putc)(char c) = null_prom_putc;
-void (* prom_printf)(const char * fmt, ...) = null_prom_printf;
+static void (* __prom_putc)(char c) = null_prom_putc;
+
+void prom_putchar(char c)
+{
+        __prom_putc(c);
+}
+
 void (* prom_display)(const char *string, int pos, int clear) =
                 null_prom_display;
 void (* prom_monitor)(void) = null_prom_monitor;
 
 unsigned int lasat_ndelay_divider;
 
-#define PROM_PRINTFBUF_SIZE 256
-static char prom_printfbuf[PROM_PRINTFBUF_SIZE];
-
-static void real_prom_printf(const char * fmt, ...)
-{
-        va_list ap;
-        int len;
-        char *c = prom_printfbuf;
-        int i;
-
-        va_start(ap, fmt);
-        len = vsnprintf(prom_printfbuf, PROM_PRINTFBUF_SIZE, fmt, ap);
-        va_end(ap);
-
-        /* output overflowed the buffer */
-        if (len < 0 || len > PROM_PRINTFBUF_SIZE)
-                len = PROM_PRINTFBUF_SIZE;
-
-        for (i=0; i < len; i++) {
-                if (*c == '\n')
-                        prom_putc('\r');
-                prom_putc(*c++);
-        }
-}
-
 static void setup_prom_vectors(void)
 {
         u32 version = *(u32 *)(RESET_VECTOR + 0x90);
 
         if (version >= 307) {
                 prom_display = (void *)PROM_DISPLAY_ADDR;
-                prom_putc = (void *)PROM_PUTC_ADDR;
-                prom_printf = real_prom_printf;
+                __prom_putc = (void *)PROM_PUTC_ADDR;
                 prom_monitor = (void *)PROM_MONITOR_ADDR;
         }
-        prom_printf("prom vectors set up\n");
+        printk("prom vectors set up\n");
 }
 
 static struct at93c_defs at93c_defs[N_MACHTYPES] = {
@@ -101,11 +76,11 @@ void __init prom_init(void)
         setup_prom_vectors();
 
         if (current_cpu_data.cputype == CPU_R5000) {
-                prom_printf("LASAT 200 board\n");
+                printk("LASAT 200 board\n");
                 mips_machtype = MACH_LASAT_200;
                 lasat_ndelay_divider = LASAT_200_DIVIDER;
         } else {
-                prom_printf("LASAT 100 board\n");
+                printk("LASAT 100 board\n");
                 mips_machtype = MACH_LASAT_100;
                 lasat_ndelay_divider = LASAT_100_DIVIDER;
         }