diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-08-07 15:47:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-13 19:50:19 -0400 |
commit | b19e2ca77ee4becadc85341bb0c1cee454dd4fd5 (patch) | |
tree | 783ee3b9e363cf1848ad373cbb558f1c5994df08 /drivers/s390/char | |
parent | 2cb4ca0208722836e921d5ba780b09f29d4026b8 (diff) |
TTY: use tty_port_link_device
So now for those drivers that can use neither tty_port_install nor
tty_port_register_driver but still have tty_port available before
tty_register_driver we use newly added tty_port_link_device.
The rest of the drivers that still do not provide tty_struct <->
tty_port link will have to be converted to implement
tty->ops->install.
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>
Diffstat (limited to 'drivers/s390/char')
-rw-r--r-- | drivers/s390/char/sclp_tty.c | 1 | ||||
-rw-r--r-- | drivers/s390/char/sclp_vt220.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index 0792c85baafe..30ec09e3d037 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c | |||
@@ -567,6 +567,7 @@ sclp_tty_init(void) | |||
567 | driver->init_termios.c_lflag = ISIG | ECHO; | 567 | driver->init_termios.c_lflag = ISIG | ECHO; |
568 | driver->flags = TTY_DRIVER_REAL_RAW; | 568 | driver->flags = TTY_DRIVER_REAL_RAW; |
569 | tty_set_operations(driver, &sclp_ops); | 569 | tty_set_operations(driver, &sclp_ops); |
570 | tty_port_link_device(&sclp_port, driver, 0); | ||
570 | rc = tty_register_driver(driver); | 571 | rc = tty_register_driver(driver); |
571 | if (rc) { | 572 | if (rc) { |
572 | put_tty_driver(driver); | 573 | put_tty_driver(driver); |
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c index edfc0fd73dc6..7e60f3d2f3f9 100644 --- a/drivers/s390/char/sclp_vt220.c +++ b/drivers/s390/char/sclp_vt220.c | |||
@@ -691,6 +691,7 @@ static int __init sclp_vt220_tty_init(void) | |||
691 | driver->init_termios = tty_std_termios; | 691 | driver->init_termios = tty_std_termios; |
692 | driver->flags = TTY_DRIVER_REAL_RAW; | 692 | driver->flags = TTY_DRIVER_REAL_RAW; |
693 | tty_set_operations(driver, &sclp_vt220_ops); | 693 | tty_set_operations(driver, &sclp_vt220_ops); |
694 | tty_port_link_device(&sclp_vt220_port, driver, 0); | ||
694 | 695 | ||
695 | rc = tty_register_driver(driver); | 696 | rc = tty_register_driver(driver); |
696 | if (rc) | 697 | if (rc) |