diff options
| author | Lidza Louina <lidza.louina@gmail.com> | 2013-08-13 15:49:54 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-14 14:05:36 -0700 |
| commit | bf0f2ebff31adf786b59bc84d0522fed246c9471 (patch) | |
| tree | 0ee9d08b4483153fee05fe6660297c679b349749 /drivers/staging/dgnc/dgnc_tty.c | |
| parent | 22e3de76ab7f4e02825a158cb2575feb5be6b062 (diff) | |
| download | linux-bf0f2ebff31adf786b59bc84d0522fed246c9471.tar.bz2 | |
staging: dgnc: fixes tty_port and tty_struct params
The functions tty_flip_buffer_push, tty_insert_flip_string,
tty_insert_flip_char and tty_buffer_request_room now require a struct of
type tty_port instead of struct tty_struct. This patch makes those
changes.
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgnc/dgnc_tty.c')
| -rw-r--r-- | drivers/staging/dgnc/dgnc_tty.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 63b80e280e08..a00fe2bcaad8 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -870,7 +870,7 @@ void dgnc_input(struct channel_t *ch) } else { - len = tty_buffer_request_room(tp, len); + len = tty_buffer_request_room(tp->port, len); n = len; /* @@ -894,17 +894,17 @@ void dgnc_input(struct channel_t *ch) if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) { for (i = 0; i < s; i++) { if (*(ch->ch_equeue + tail + i) & UART_LSR_BI) - tty_insert_flip_char(tp, *(ch->ch_rqueue + tail + i), TTY_BREAK); + tty_insert_flip_char(tp->port, *(ch->ch_rqueue + tail + i), TTY_BREAK); else if (*(ch->ch_equeue + tail + i) & UART_LSR_PE) - tty_insert_flip_char(tp, *(ch->ch_rqueue + tail + i), TTY_PARITY); + tty_insert_flip_char(tp->port, *(ch->ch_rqueue + tail + i), TTY_PARITY); else if (*(ch->ch_equeue + tail + i) & UART_LSR_FE) - tty_insert_flip_char(tp, *(ch->ch_rqueue + tail + i), TTY_FRAME); + tty_insert_flip_char(tp->port, *(ch->ch_rqueue + tail + i), TTY_FRAME); else - tty_insert_flip_char(tp, *(ch->ch_rqueue + tail + i), TTY_NORMAL); + tty_insert_flip_char(tp->port, *(ch->ch_rqueue + tail + i), TTY_NORMAL); } } else { - tty_insert_flip_string(tp, ch->ch_rqueue + tail, s); + tty_insert_flip_string(tp->port, ch->ch_rqueue + tail, s); } dgnc_sniff_nowait_nolock(ch, "USER READ", ch->ch_rqueue + tail, s); @@ -921,7 +921,7 @@ void dgnc_input(struct channel_t *ch) DGNC_UNLOCK(ch->ch_lock, lock_flags); /* Tell the tty layer its okay to "eat" the data now */ - tty_flip_buffer_push(tp); + tty_flip_buffer_push(tp->port); } if (ld) |