diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2015-07-31 16:59:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-05 01:07:23 -0400 |
commit | 9e31364fc3272073ec8c5fac18a3e01d4f013418 (patch) | |
tree | 816beb7a432e52a6b8c899c235d8206c0ee28812 | |
parent | 6fb98fb3031359af42a6ee6984b477cbcfdca7bd (diff) |
serial: core: Remove tty port activate() and shutdown() methods
serial core does not use tty_port_open() or tty_port_close(); serial
core defines and extends it's own tty open() and close() methods
(uart_open() and uart_close(), respectively).
Remove the tty_port activate() and shutdown() initializations, and
the uart_port_activate() function, which is never called.
NB: uart_port_shutdown() is used by uart_close() => uart_shutdown()
call chain (but not via the tty_port methods).
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/tty/serial/serial_core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 6ae7cc118ac4..603d2cc3f424 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c | |||
@@ -1530,11 +1530,6 @@ static void uart_hangup(struct tty_struct *tty) | |||
1530 | mutex_unlock(&port->mutex); | 1530 | mutex_unlock(&port->mutex); |
1531 | } | 1531 | } |
1532 | 1532 | ||
1533 | static int uart_port_activate(struct tty_port *port, struct tty_struct *tty) | ||
1534 | { | ||
1535 | return 0; | ||
1536 | } | ||
1537 | |||
1538 | static void uart_port_shutdown(struct tty_port *port) | 1533 | static void uart_port_shutdown(struct tty_port *port) |
1539 | { | 1534 | { |
1540 | struct uart_state *state = container_of(port, struct uart_state, port); | 1535 | struct uart_state *state = container_of(port, struct uart_state, port); |
@@ -2377,8 +2372,6 @@ static const struct tty_operations uart_ops = { | |||
2377 | }; | 2372 | }; |
2378 | 2373 | ||
2379 | static const struct tty_port_operations uart_port_ops = { | 2374 | static const struct tty_port_operations uart_port_ops = { |
2380 | .activate = uart_port_activate, | ||
2381 | .shutdown = uart_port_shutdown, | ||
2382 | .carrier_raised = uart_carrier_raised, | 2375 | .carrier_raised = uart_carrier_raised, |
2383 | .dtr_rts = uart_dtr_rts, | 2376 | .dtr_rts = uart_dtr_rts, |
2384 | }; | 2377 | }; |