TTY: add support for unnumbered device nodes
This allows drivers like ttyprintk to avoid hacks to create an unnumbered node in /dev. It used to set TTY_DRIVER_DYNAMIC_DEV in flags and call device_create on its own. That is incorrect, because TTY_DRIVER_DYNAMIC_DEV may be set only if tty_register_device is called explicitly. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
16a02081ba
commit
0019b4089c
@@ -178,13 +178,15 @@ static struct tty_driver *ttyprintk_driver;
|
||||
static int __init ttyprintk_init(void)
|
||||
{
|
||||
int ret = -ENOMEM;
|
||||
void *rp;
|
||||
|
||||
tty_port_init(&tpk_port.port);
|
||||
tpk_port.port.ops = &null_ops;
|
||||
mutex_init(&tpk_port.port_write_mutex);
|
||||
|
||||
ttyprintk_driver = alloc_tty_driver(1);
|
||||
ttyprintk_driver = tty_alloc_driver(1,
|
||||
TTY_DRIVER_RESET_TERMIOS |
|
||||
TTY_DRIVER_REAL_RAW |
|
||||
TTY_DRIVER_UNNUMBERED_NODE);
|
||||
if (!ttyprintk_driver)
|
||||
return ret;
|
||||
|
||||
@@ -195,8 +197,6 @@ static int __init ttyprintk_init(void)
|
||||
ttyprintk_driver->type = TTY_DRIVER_TYPE_CONSOLE;
|
||||
ttyprintk_driver->init_termios = tty_std_termios;
|
||||
ttyprintk_driver->init_termios.c_oflag = OPOST | OCRNL | ONOCR | ONLRET;
|
||||
ttyprintk_driver->flags = TTY_DRIVER_RESET_TERMIOS |
|
||||
TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
|
||||
tty_set_operations(ttyprintk_driver, &ttyprintk_ops);
|
||||
|
||||
ret = tty_register_driver(ttyprintk_driver);
|
||||
@@ -205,15 +205,6 @@ static int __init ttyprintk_init(void)
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* create our unnumbered device */
|
||||
rp = device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 3), NULL,
|
||||
ttyprintk_driver->name);
|
||||
if (IS_ERR(rp)) {
|
||||
printk(KERN_ERR "Couldn't create ttyprintk device\n");
|
||||
ret = PTR_ERR(rp);
|
||||
goto error;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
|
Reference in New Issue
Block a user