diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-10-02 16:24:50 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-10-02 16:24:50 +0900 |
| commit | 008d50fc16e8ea5005d324a25d62d29e417151fe (patch) | |
| tree | 724cac166762e595d4db388dcde29f733d2f5612 /arch/sh | |
| parent | 78d7e0e5b8e5d662c3e4bdceadbd84c913e69614 (diff) | |
| download | linux-3.10-008d50fc16e8ea5005d324a25d62d29e417151fe.tar.gz linux-3.10-008d50fc16e8ea5005d324a25d62d29e417151fe.tar.bz2 linux-3.10-008d50fc16e8ea5005d324a25d62d29e417151fe.zip | |
sh: early_printk tidying.
setup_early_printk() can be static, and with that, we can kill off
the early initialization variable and move the CON_BOOT check in
to the function body.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/early_printk.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c index 85ed5b7ef27..2f30977558a 100644 --- a/arch/sh/kernel/early_printk.c +++ b/arch/sh/kernel/early_printk.c @@ -3,7 +3,7 @@ * * Copyright (C) 1999, 2000 Niibe Yutaka * Copyright (C) 2002 M. R. Brown - * Copyright (C) 2004 - 2006 Paul Mundt + * Copyright (C) 2004 - 2007 Paul Mundt * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -73,8 +73,6 @@ static struct console bios_console = { #define EPK_FIFO_BITS (0x1f00 >> 8) #endif - - static struct uart_port scif_port = { .mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT, .membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT, @@ -192,17 +190,12 @@ static struct console *early_console = #endif ; -static int __initdata keep_early; -static int early_console_initialized; - -int __init setup_early_printk(char *buf) +static int __init setup_early_printk(char *buf) { - if (!buf) - return 0; + int keep_early = 0; - if (early_console_initialized) + if (!buf) return 0; - early_console_initialized = 1; if (strstr(buf, "keep")) keep_early = 1; |