diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-03-01 11:56:43 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-03-04 19:02:37 +0000 |
commit | 36a885306fdf7bb557c773309c993bfb2d0d693c (patch) | |
tree | 643b246c90653c9451ff7fecff74a79c3de8042c /arch/mips/dec/prom | |
parent | ca471c86043f4a8b01cba02ba2d3431fddcaf606 (diff) | |
download | kernel_samsung_espresso10-36a885306fdf7bb557c773309c993bfb2d0d693c.zip kernel_samsung_espresso10-36a885306fdf7bb557c773309c993bfb2d0d693c.tar.gz kernel_samsung_espresso10-36a885306fdf7bb557c773309c993bfb2d0d693c.tar.bz2 |
[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>
Diffstat (limited to 'arch/mips/dec/prom')
-rw-r--r-- | arch/mips/dec/prom/console.c | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/arch/mips/dec/prom/console.c b/arch/mips/dec/prom/console.c index cade16e..65419bf 100644 --- a/arch/mips/dec/prom/console.c +++ b/arch/mips/dec/prom/console.c @@ -16,40 +16,12 @@ #include <asm/dec/prom.h> -static void __init prom_console_write(struct console *con, const char *s, - unsigned int c) +void prom_putchar(char c) { - static char sfmt[] __initdata = "%%%us"; - char fmt[13]; + char s[2]; - snprintf(fmt, sizeof(fmt), sfmt, c); - prom_printf(fmt, s); -} - -static struct console promcons __initdata = { - .name = "prom", - .write = prom_console_write, - .flags = CON_PRINTBUFFER, - .index = -1, -}; - -static int promcons_output __initdata = 0; - -void __init register_prom_console(void) -{ - if (!promcons_output) { - promcons_output = 1; - register_console(&promcons); - } -} + s[0] = c; + s[1] = '\0'; -void __init unregister_prom_console(void) -{ - if (promcons_output) { - unregister_console(&promcons); - promcons_output = 0; - } + prom_printf( s); } - -void disable_early_printk(void) - __attribute__((alias("unregister_prom_console"))); |