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>
This commit is contained in:
parent
78d7e0e5b8
commit
008d50fc16
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) 1999, 2000 Niibe Yutaka
|
* Copyright (C) 1999, 2000 Niibe Yutaka
|
||||||
* Copyright (C) 2002 M. R. Brown
|
* 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
|
* 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
|
* 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)
|
#define EPK_FIFO_BITS (0x1f00 >> 8)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static struct uart_port scif_port = {
|
static struct uart_port scif_port = {
|
||||||
.mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT,
|
.mapbase = CONFIG_EARLY_SCIF_CONSOLE_PORT,
|
||||||
.membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,
|
.membase = (char __iomem *)CONFIG_EARLY_SCIF_CONSOLE_PORT,
|
||||||
|
@ -192,18 +190,13 @@ static struct console *early_console =
|
||||||
#endif
|
#endif
|
||||||
;
|
;
|
||||||
|
|
||||||
static int __initdata keep_early;
|
static int __init setup_early_printk(char *buf)
|
||||||
static int early_console_initialized;
|
|
||||||
|
|
||||||
int __init setup_early_printk(char *buf)
|
|
||||||
{
|
{
|
||||||
|
int keep_early = 0;
|
||||||
|
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (early_console_initialized)
|
|
||||||
return 0;
|
|
||||||
early_console_initialized = 1;
|
|
||||||
|
|
||||||
if (strstr(buf, "keep"))
|
if (strstr(buf, "keep"))
|
||||||
keep_early = 1;
|
keep_early = 1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue