diff options
| author | Johan Hovold <johan@kernel.org> | 2017-05-18 11:33:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-18 11:38:25 -0400 |
| commit | da4c279942b05727088774df224c0734688b4cbc (patch) | |
| tree | 02791800d6faa7d5aa56065f03a29b2f265c3220 | |
| parent | 8cde11b2baa1d02eb2eb955dfd47d9f2a12f12cf (diff) | |
serial: enable serdev support
Enable serdev support by using the new device-registration helpers.
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index bc6caea6099f..13bfd5dcffce 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c | |||
| @@ -2782,7 +2782,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport) | |||
| 2782 | * Register the port whether it's detected or not. This allows | 2782 | * Register the port whether it's detected or not. This allows |
| 2783 | * setserial to be used to alter this port's parameters. | 2783 | * setserial to be used to alter this port's parameters. |
| 2784 | */ | 2784 | */ |
| 2785 | tty_dev = tty_port_register_device_attr(port, drv->tty_driver, | 2785 | tty_dev = tty_port_register_device_attr_serdev(port, drv->tty_driver, |
| 2786 | uport->line, uport->dev, port, uport->tty_groups); | 2786 | uport->line, uport->dev, port, uport->tty_groups); |
| 2787 | if (likely(!IS_ERR(tty_dev))) { | 2787 | if (likely(!IS_ERR(tty_dev))) { |
| 2788 | device_set_wakeup_capable(tty_dev, 1); | 2788 | device_set_wakeup_capable(tty_dev, 1); |
| @@ -2845,7 +2845,7 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport) | |||
| 2845 | /* | 2845 | /* |
| 2846 | * Remove the devices from the tty layer | 2846 | * Remove the devices from the tty layer |
| 2847 | */ | 2847 | */ |
| 2848 | tty_unregister_device(drv->tty_driver, uport->line); | 2848 | tty_port_unregister_device(port, drv->tty_driver, uport->line); |
| 2849 | 2849 | ||
| 2850 | tty = tty_port_tty_get(port); | 2850 | tty = tty_port_tty_get(port); |
| 2851 | if (tty) { | 2851 | if (tty) { |
