[linuxsh-dev] sh_console_unregister

[NIIBE Y. <gn...@ch...>]

I'm preparing the update patch (to mainstream).  To avoid the changes
small, I'd like to apply following changes for console handling.

I assume that EARLY_PRINTK feature is for SH serial console only, so
it's OK to place calling unregister routine at SCI driver.

Yes, if someone extend the BIOS to support other serial chiip, this
is not good.  But until that time, I think this is good thing.


2000-07-21  NIIBE Yutaka  <gn...@m1...>

	* drivers/char/tty_io.c (console_init): Don't call
	sh_console_unregister.

	* drivers/char/sh-sci.c (sci_console_init): Call
	sh_console_unregister here, instead.

Index: drivers/char/sh-sci.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/drivers/char/sh-sci.c,v
retrieving revision 1.13
diff -u -r1.13 sh-sci.c
--- drivers/char/sh-sci.c	2000/07/20 16:01:45	1.13
+++ drivers/char/sh-sci.c	2000/07/21 02:53:06
@@ -1099,8 +1099,18 @@
  *	Register console.
  */
 
+#ifdef CONFIG_SH_EARLY_PRINTK
+extern void sh_console_unregister (void);
+#endif
+
 void __init sci_console_init(void)
 {
 	register_console(&sercons);
+#ifdef CONFIG_SH_EARLY_PRINTK
+	/* Now that the real console is available, unregister the one we
+	 * used while first booting.
+	 */
+	sh_console_unregister();
+#endif
 }
 #endif /* CONFIG_SERIAL_CONSOLE */
Index: drivers/char/tty_io.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/drivers/char/tty_io.c,v
retrieving revision 1.10
diff -u -r1.10 tty_io.c
--- drivers/char/tty_io.c	2000/07/20 13:26:48	1.10
+++ drivers/char/tty_io.c	2000/07/21 02:53:07
@@ -102,9 +102,7 @@
 #ifdef CONFIG_VT
 extern void con_init_devfs (void);
 #endif
-#ifdef CONFIG_SH_EARLY_PRINTK
-extern void sh_console_unregister (void);
-#endif
+extern int rio_init(void);
 
 #define CONSOLE_DEV MKDEV(TTY_MAJOR,0)
 #define TTY_DEV MKDEV(TTYAUX_MAJOR,0)
@@ -2186,12 +2184,6 @@
 #endif
 #if defined(CONFIG_SH_SCI)
 	sci_console_init();
-#endif
-#ifdef CONFIG_SH_EARLY_PRINTK
-    /* Now that the real console is available, unregister the one we
-     * used while first booting.
-     */
-    sh_console_unregister();
 #endif
 #endif
 #ifdef CONFIG_3215