mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
sh: sh-sci: Fix double initialization by serial_console_setup
The driver is initialized in a state with an unknown value by serial_console_setup. And initialization fails. This is caused by the initialization by sci_console_init. This function does not seem to be necessary for the present sh-sci driver. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
b2267a6b09
commit
6a8c979935
1 changed files with 6 additions and 13 deletions
|
@ -1872,13 +1872,6 @@ static struct console serial_console = {
|
|||
.data = &sci_uart_driver,
|
||||
};
|
||||
|
||||
static int __init sci_console_init(void)
|
||||
{
|
||||
register_console(&serial_console);
|
||||
return 0;
|
||||
}
|
||||
console_initcall(sci_console_init);
|
||||
|
||||
static struct console early_serial_console = {
|
||||
.name = "early_ttySC",
|
||||
.write = serial_console_write,
|
||||
|
@ -1907,18 +1900,18 @@ static int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
|
|||
register_console(&early_serial_console);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define SCI_CONSOLE (&serial_console)
|
||||
|
||||
#else
|
||||
static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
|
||||
|
||||
#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE)
|
||||
#define SCI_CONSOLE (&serial_console)
|
||||
#else
|
||||
#define SCI_CONSOLE 0
|
||||
#endif
|
||||
#define SCI_CONSOLE NULL
|
||||
|
||||
#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
|
||||
|
||||
static char banner[] __initdata =
|
||||
KERN_INFO "SuperH SCI(F) driver initialized\n";
|
||||
|
|
Loading…
Reference in a new issue