|
@@ -4045,7 +4045,7 @@ struct device *tty_register_device(struct tty_driver *driver, unsigned index,
|
|
|
else
|
|
|
tty_line_name(driver, index, name);
|
|
|
|
|
|
- return device_create(tty_class, device, dev, name);
|
|
|
+ return device_create_drvdata(tty_class, device, dev, NULL, name);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -4323,20 +4323,22 @@ static int __init tty_init(void)
|
|
|
if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
|
|
|
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
|
|
|
panic("Couldn't register /dev/tty driver\n");
|
|
|
- device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), "tty");
|
|
|
+ device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL,
|
|
|
+ "tty");
|
|
|
|
|
|
cdev_init(&console_cdev, &console_fops);
|
|
|
if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
|
|
|
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
|
|
|
panic("Couldn't register /dev/console driver\n");
|
|
|
- device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), "console");
|
|
|
+ device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL,
|
|
|
+ "console");
|
|
|
|
|
|
#ifdef CONFIG_UNIX98_PTYS
|
|
|
cdev_init(&ptmx_cdev, &ptmx_fops);
|
|
|
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
|
|
|
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
|
|
|
panic("Couldn't register /dev/ptmx driver\n");
|
|
|
- device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), "ptmx");
|
|
|
+ device_create_drvdata(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_VT
|
|
@@ -4344,7 +4346,7 @@ static int __init tty_init(void)
|
|
|
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");
|
|
|
- device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0");
|
|
|
+ device_create_drvdata(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
|
|
|
|
|
|
vty_init();
|
|
|
#endif
|