diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-08-07 15:47:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-13 19:50:19 -0400 |
commit | 734cc1783816ae358cef45673a29bf7af974e147 (patch) | |
tree | 146fde2a1add56ff7a35915d0fd1db7e01ce6630 /arch/um/drivers/line.c | |
parent | 7e73eca6a7b2967423902a4543821bb97cbbe698 (diff) |
TTY: use tty_port_register_device
Currently we have no way to assign tty->port while performing tty
installation. There are two ways to provide the link tty_struct =>
tty_port. Either by calling tty_port_install from tty->ops->install or
tty_port_register_device called instead of tty_register_device when
the device is being set up after connected.
In this patch we modify most of the drivers to do the latter. When the
drivers use tty_register_device and we have tty_port already, we
switch to tty_port_register_device. So we have the tty_struct =>
tty_port link for free for those.
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 'arch/um/drivers/line.c')
-rw-r--r-- | arch/um/drivers/line.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index bbaf2c59830a..457475f98414 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
@@ -409,7 +409,8 @@ int setup_one_line(struct line *lines, int n, char *init, | |||
409 | line->valid = 1; | 409 | line->valid = 1; |
410 | err = parse_chan_pair(new, line, n, opts, error_out); | 410 | err = parse_chan_pair(new, line, n, opts, error_out); |
411 | if (!err) { | 411 | if (!err) { |
412 | struct device *d = tty_register_device(driver, n, NULL); | 412 | struct device *d = tty_port_register_device(&line->port, |
413 | driver, n, NULL); | ||
413 | if (IS_ERR(d)) { | 414 | if (IS_ERR(d)) { |
414 | *error_out = "Failed to register device"; | 415 | *error_out = "Failed to register device"; |
415 | err = PTR_ERR(d); | 416 | err = PTR_ERR(d); |