diff options
author | Jiri Slaby <jslaby@suse.cz> | 2013-01-03 09:53:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 01:30:15 -0500 |
commit | 2e124b4a390ca85325fae75764bef92f0547fa25 (patch) | |
tree | 5519fbcdbe954e79b271ea6d31ac5a4dc754c4f5 /drivers/tty/serial/mux.c | |
parent | d6c53c0e9bd0a83f9f9ddbc9fd80141a54d83896 (diff) |
TTY: switch tty_flip_buffer_push
Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty in many
call sites. Only tty_port will needed and hence no more
tty_port_tty_get in those paths.
Now, the one where most of tty_port_tty_get gets removed:
tty_flip_buffer_push.
IOW we also closed all the races in drivers not using tty_port_tty_get
at all yet.
Also we move tty_flip_buffer_push declaration from include/linux/tty.h
to include/linux/tty_flip.h to all others while we are changing it
anyway.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/mux.c')
-rw-r--r-- | drivers/tty/serial/mux.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c index 83b21686020e..7fd6aaaacd8e 100644 --- a/drivers/tty/serial/mux.c +++ b/drivers/tty/serial/mux.c | |||
@@ -244,7 +244,6 @@ static void mux_read(struct uart_port *port) | |||
244 | { | 244 | { |
245 | struct tty_port *tport = &port->state->port; | 245 | struct tty_port *tport = &port->state->port; |
246 | int data; | 246 | int data; |
247 | struct tty_struct *tty = tport->tty; | ||
248 | __u32 start_count = port->icount.rx; | 247 | __u32 start_count = port->icount.rx; |
249 | 248 | ||
250 | while(1) { | 249 | while(1) { |
@@ -270,9 +269,8 @@ static void mux_read(struct uart_port *port) | |||
270 | tty_insert_flip_char(tport, data & 0xFF, TTY_NORMAL); | 269 | tty_insert_flip_char(tport, data & 0xFF, TTY_NORMAL); |
271 | } | 270 | } |
272 | 271 | ||
273 | if (start_count != port->icount.rx) { | 272 | if (start_count != port->icount.rx) |
274 | tty_flip_buffer_push(tty); | 273 | tty_flip_buffer_push(tport); |
275 | } | ||
276 | } | 274 | } |
277 | 275 | ||
278 | /** | 276 | /** |