diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2013-01-03 15:53:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-15 22:17:28 -0800 |
| commit | 227434f8986c3827a1faedd1feb437acd6285315 (patch) | |
| tree | e96f6c6a800b81d096be73c1b7943c7aa24aa632 /drivers/tty/serial/mrst_max3110.c | |
| parent | ea28fd56fcde69af768135e428093f94c5ca6a88 (diff) | |
TTY: switch tty_buffer_request_room to tty_port
Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty pointer in
many call sites. Only tty_port will be needed and hence no more
tty_port_tty_get calls in those paths.
Here we start with tty_buffer_request_room.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/mrst_max3110.c')
| -rw-r--r-- | drivers/tty/serial/mrst_max3110.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c index 58734d7e746d..776431ff0190 100644 --- a/drivers/tty/serial/mrst_max3110.c +++ b/drivers/tty/serial/mrst_max3110.c @@ -339,6 +339,7 @@ static int receive_chars(struct uart_max3110 *max, unsigned short *str, int len) { struct uart_port *port = &max->port; + struct tty_port *tport; struct tty_struct *tty; char buf[M3110_RX_FIFO_DEPTH]; int r, w, usable; @@ -347,7 +348,8 @@ receive_chars(struct uart_max3110 *max, unsigned short *str, int len) if (!port->state) return 0; - tty = tty_port_tty_get(&port->state->port); + tport = &port->state->port; + tty = tty_port_tty_get(tport); if (!tty) return 0; @@ -370,7 +372,7 @@ receive_chars(struct uart_max3110 *max, unsigned short *str, int len) } for (r = 0; w; r += usable, w -= usable) { - usable = tty_buffer_request_room(tty, w); + usable = tty_buffer_request_room(tport, w); if (usable) { tty_insert_flip_string(tty, buf + r, usable); port->icount.rx += usable; |