aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>2011-03-23 22:20:56 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-03-31 01:33:24 -0400
commit6a8c979935f1955707fe79909cb3baf9575282f4 (patch)
tree2b05cffbdf8e5bcc3c47bb5f4f1f2cac36ec5374 /drivers
parentb2267a6b095afb84b5766d6646e581b9054704d9 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/sh-sci.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 264209c32675..4e530a58bb1d 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1872,13 +1872,6 @@ static struct console serial_console = {
1872 .data = &sci_uart_driver, 1872 .data = &sci_uart_driver,
1873}; 1873};
1874 1874
1875static int __init sci_console_init(void)
1876{
1877 register_console(&serial_console);
1878 return 0;
1879}
1880console_initcall(sci_console_init);
1881
1882static struct console early_serial_console = { 1875static struct console early_serial_console = {
1883 .name = "early_ttySC", 1876 .name = "early_ttySC",
1884 .write = serial_console_write, 1877 .write = serial_console_write,
@@ -1907,18 +1900,18 @@ static int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
1907 register_console(&early_serial_console); 1900 register_console(&early_serial_console);
1908 return 0; 1901 return 0;
1909} 1902}
1903
1904#define SCI_CONSOLE (&serial_console)
1905
1910#else 1906#else
1911static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev) 1907static inline int __devinit sci_probe_earlyprintk(struct platform_device *pdev)
1912{ 1908{
1913 return -EINVAL; 1909 return -EINVAL;
1914} 1910}
1915#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
1916 1911
1917#if defined(CONFIG_SERIAL_SH_SCI_CONSOLE) 1912#define SCI_CONSOLE NULL
1918#define SCI_CONSOLE (&serial_console) 1913
1919#else 1914#endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
1920#define SCI_CONSOLE 0
1921#endif
1922 1915
1923static char banner[] __initdata = 1916static char banner[] __initdata =
1924 KERN_INFO "SuperH SCI(F) driver initialized\n"; 1917 KERN_INFO "SuperH SCI(F) driver initialized\n";