[2.6 patch] drivers/char/tty_io.c: remove console_use_vt

From: Adrian Bunk (bunk_at_stusta.de)
Date: 01/31/05

  • Next message: Adrian Bunk: "[2.6 patch] drivers/char/vt*: possible cleanups" 
    Date:	Mon, 31 Jan 2005 18:41:05 +0100
To: linux-kernel@vger.kernel.org

    The global variable console_use_vt never changed its' value.

    Signed-off-by: Adrian Bunk <bunk@stusta.de> 

    ---
 drivers/char/tty_io.c |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)
--- linux-2.6.11-rc2-mm2-full/drivers/char/tty_io.c.old	2005-01-31 15:45:20.000000000 +0100
+++ linux-2.6.11-rc2-mm2-full/drivers/char/tty_io.c	2005-01-31 15:45:56.000000000 +0100
@@ -131,8 +131,6 @@
    vt.c for deeply disgusting hack reasons */
 DECLARE_MUTEX(tty_sem);
 
-int console_use_vt = 1;
-
 #ifdef CONFIG_UNIX98_PTYS
 extern struct tty_driver *ptm_driver;	/* Unix98 pty masters; for /dev/ptmx */
 extern int pty_limit;		/* Config limit on Unix98 ptys */
@@ -2962,19 +2960,17 @@
 #endif
 
 #ifdef CONFIG_VT
-	if (console_use_vt) {
-		cdev_init(&vc0_cdev, &console_fops);
-		if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
-		    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1,
-					   "/dev/vc/0") < 0)
-			panic("Couldn't register /dev/tty0 driver\n");
-		devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR,
-			      "vc/0");
-		class_simple_device_add(tty_class, MKDEV(TTY_MAJOR, 0), NULL,
-					"tty0");
+	cdev_init(&vc0_cdev, &console_fops);
+	if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
+	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1,
+				   "/dev/vc/0") < 0)
+		panic("Couldn't register /dev/tty0 driver\n");
+	devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR,
+		      "vc/0");
+	class_simple_device_add(tty_class, MKDEV(TTY_MAJOR, 0), NULL,
+				"tty0");
 
-		vty_init();
-	}
+	vty_init();
 #endif
 	return 0;
 }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
  • Next message: Adrian Bunk: "[2.6 patch] drivers/char/vt*: possible cleanups"

    Relevant Pages