diff options
Diffstat (limited to 'drivers/char/tty_io.c')
-rw-r--r-- | drivers/char/tty_io.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 8b2a59969868..0b9a33c0f1bd 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -2979,9 +2979,6 @@ struct class_device *tty_register_device(struct tty_driver *driver, | |||
2979 | return ERR_PTR(-EINVAL); | 2979 | return ERR_PTR(-EINVAL); |
2980 | } | 2980 | } |
2981 | 2981 | ||
2982 | devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR, | ||
2983 | "%s%d", driver->devfs_name, index + driver->name_base); | ||
2984 | |||
2985 | if (driver->type == TTY_DRIVER_TYPE_PTY) | 2982 | if (driver->type == TTY_DRIVER_TYPE_PTY) |
2986 | pty_line_name(driver, index, name); | 2983 | pty_line_name(driver, index, name); |
2987 | else | 2984 | else |
@@ -3241,14 +3238,12 @@ static int __init tty_init(void) | |||
3241 | if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || | 3238 | if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || |
3242 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) | 3239 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) |
3243 | panic("Couldn't register /dev/tty driver\n"); | 3240 | panic("Couldn't register /dev/tty driver\n"); |
3244 | devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty"); | ||
3245 | class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty"); | 3241 | class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty"); |
3246 | 3242 | ||
3247 | cdev_init(&console_cdev, &console_fops); | 3243 | cdev_init(&console_cdev, &console_fops); |
3248 | if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) || | 3244 | if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) || |
3249 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0) | 3245 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0) |
3250 | panic("Couldn't register /dev/console driver\n"); | 3246 | panic("Couldn't register /dev/console driver\n"); |
3251 | devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console"); | ||
3252 | class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console"); | 3247 | class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console"); |
3253 | 3248 | ||
3254 | #ifdef CONFIG_UNIX98_PTYS | 3249 | #ifdef CONFIG_UNIX98_PTYS |
@@ -3256,7 +3251,6 @@ static int __init tty_init(void) | |||
3256 | if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || | 3251 | if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || |
3257 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) | 3252 | register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) |
3258 | panic("Couldn't register /dev/ptmx driver\n"); | 3253 | panic("Couldn't register /dev/ptmx driver\n"); |
3259 | devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx"); | ||
3260 | class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx"); | 3254 | class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx"); |
3261 | #endif | 3255 | #endif |
3262 | 3256 | ||
@@ -3265,7 +3259,6 @@ static int __init tty_init(void) | |||
3265 | if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || | 3259 | if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || |
3266 | register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) | 3260 | register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) |
3267 | panic("Couldn't register /dev/tty0 driver\n"); | 3261 | panic("Couldn't register /dev/tty0 driver\n"); |
3268 | devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0"); | ||
3269 | class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0"); | 3262 | class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0"); |
3270 | 3263 | ||
3271 | vty_init(); | 3264 | vty_init(); |