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/msm_serial.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/msm_serial.c')
-rw-r--r-- | drivers/tty/serial/msm_serial.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c index cb787c0e279a..b11e99797fd8 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c | |||
@@ -92,7 +92,6 @@ static void msm_enable_ms(struct uart_port *port) | |||
92 | static void handle_rx_dm(struct uart_port *port, unsigned int misr) | 92 | static void handle_rx_dm(struct uart_port *port, unsigned int misr) |
93 | { | 93 | { |
94 | struct tty_port *tport = &port->state->port; | 94 | struct tty_port *tport = &port->state->port; |
95 | struct tty_struct *tty = tport->tty; | ||
96 | unsigned int sr; | 95 | unsigned int sr; |
97 | int count = 0; | 96 | int count = 0; |
98 | struct msm_port *msm_port = UART_TO_MSM(port); | 97 | struct msm_port *msm_port = UART_TO_MSM(port); |
@@ -138,7 +137,7 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr) | |||
138 | count -= 4; | 137 | count -= 4; |
139 | } | 138 | } |
140 | 139 | ||
141 | tty_flip_buffer_push(tty); | 140 | tty_flip_buffer_push(tport); |
142 | if (misr & (UART_IMR_RXSTALE)) | 141 | if (misr & (UART_IMR_RXSTALE)) |
143 | msm_write(port, UART_CR_CMD_RESET_STALE_INT, UART_CR); | 142 | msm_write(port, UART_CR_CMD_RESET_STALE_INT, UART_CR); |
144 | msm_write(port, 0xFFFFFF, UARTDM_DMRX); | 143 | msm_write(port, 0xFFFFFF, UARTDM_DMRX); |
@@ -148,7 +147,6 @@ static void handle_rx_dm(struct uart_port *port, unsigned int misr) | |||
148 | static void handle_rx(struct uart_port *port) | 147 | static void handle_rx(struct uart_port *port) |
149 | { | 148 | { |
150 | struct tty_port *tport = &port->state->port; | 149 | struct tty_port *tport = &port->state->port; |
151 | struct tty_struct *tty = tport->tty; | ||
152 | unsigned int sr; | 150 | unsigned int sr; |
153 | 151 | ||
154 | /* | 152 | /* |
@@ -191,7 +189,7 @@ static void handle_rx(struct uart_port *port) | |||
191 | tty_insert_flip_char(tport, c, flag); | 189 | tty_insert_flip_char(tport, c, flag); |
192 | } | 190 | } |
193 | 191 | ||
194 | tty_flip_buffer_push(tty); | 192 | tty_flip_buffer_push(tport); |
195 | } | 193 | } |
196 | 194 | ||
197 | static void reset_dm_count(struct uart_port *port) | 195 | static void reset_dm_count(struct uart_port *port) |