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 /arch/mn10300 | |
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 'arch/mn10300')
-rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index ae61bd692b4b..1dd20dbfd098 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c | |||
@@ -525,7 +525,6 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) | |||
525 | { | 525 | { |
526 | struct uart_icount *icount = &port->uart.icount; | 526 | struct uart_icount *icount = &port->uart.icount; |
527 | struct tty_port *port = &port->uart.state->port; | 527 | struct tty_port *port = &port->uart.state->port; |
528 | struct tty_struct *tty = port->tty; | ||
529 | unsigned ix; | 528 | unsigned ix; |
530 | int count; | 529 | int count; |
531 | u8 st, ch, push, status, overrun; | 530 | u8 st, ch, push, status, overrun; |
@@ -538,7 +537,7 @@ static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port) | |||
538 | count = tty_buffer_request_room(port, count); | 537 | count = tty_buffer_request_room(port, count); |
539 | if (count == 0) { | 538 | if (count == 0) { |
540 | if (!port->low_latency) | 539 | if (!port->low_latency) |
541 | tty_flip_buffer_push(tty); | 540 | tty_flip_buffer_push(port); |
542 | return; | 541 | return; |
543 | } | 542 | } |
544 | 543 | ||
@@ -547,7 +546,7 @@ try_again: | |||
547 | ix = ACCESS_ONCE(port->rx_outp); | 546 | ix = ACCESS_ONCE(port->rx_outp); |
548 | if (CIRC_CNT(port->rx_inp, ix, MNSC_BUFFER_SIZE) == 0) { | 547 | if (CIRC_CNT(port->rx_inp, ix, MNSC_BUFFER_SIZE) == 0) { |
549 | if (push && !port->low_latency) | 548 | if (push && !port->low_latency) |
550 | tty_flip_buffer_push(tty); | 549 | tty_flip_buffer_push(port); |
551 | return; | 550 | return; |
552 | } | 551 | } |
553 | 552 | ||
@@ -679,7 +678,7 @@ insert: | |||
679 | count--; | 678 | count--; |
680 | if (count <= 0) { | 679 | if (count <= 0) { |
681 | if (!port->low_latency) | 680 | if (!port->low_latency) |
682 | tty_flip_buffer_push(tty); | 681 | tty_flip_buffer_push(port); |
683 | return; | 682 | return; |
684 | } | 683 | } |
685 | 684 | ||