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 /drivers/mmc/card/sdio_uart.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 'drivers/mmc/card/sdio_uart.c')
-rw-r--r-- | drivers/mmc/card/sdio_uart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c index 372c0325c149..d2339ea37815 100644 --- a/drivers/mmc/card/sdio_uart.c +++ b/drivers/mmc/card/sdio_uart.c | |||
@@ -1132,8 +1132,8 @@ static int sdio_uart_probe(struct sdio_func *func, | |||
1132 | kfree(port); | 1132 | kfree(port); |
1133 | } else { | 1133 | } else { |
1134 | struct device *dev; | 1134 | struct device *dev; |
1135 | dev = tty_register_device(sdio_uart_tty_driver, | 1135 | dev = tty_port_register_device(&port->port, |
1136 | port->index, &func->dev); | 1136 | sdio_uart_tty_driver, port->index, &func->dev); |
1137 | if (IS_ERR(dev)) { | 1137 | if (IS_ERR(dev)) { |
1138 | sdio_uart_port_remove(port); | 1138 | sdio_uart_port_remove(port); |
1139 | ret = PTR_ERR(dev); | 1139 | ret = PTR_ERR(dev); |