diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2013-01-03 15:53:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-15 22:22:35 -0800 |
| commit | 05c7cd39907184328f48d3e7899f9cdd653ad336 (patch) | |
| tree | 9d1ed5c757426aa20b7eccd853faa6b519a4aa7b /drivers/isdn | |
| parent | 92a19f9cec9a80ad93c06e115822deb729e2c6ad (diff) | |
TTY: switch tty_insert_flip_string
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.
tty_insert_flip_string this time.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/gigaset/interface.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 5 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_common.h | 2 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_tty.c | 6 |
4 files changed, 7 insertions, 8 deletions
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index 67abf3ff45e8..dd2a57eca2e7 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c @@ -569,7 +569,7 @@ void gigaset_if_receive(struct cardstate *cs, return; } - tty_insert_flip_string(tty, buffer, len); + tty_insert_flip_string(&cs->port, buffer, len); tty_flip_buffer_push(tty); tty_kref_put(tty); } diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 4a387ec021ad..b87d9e577be2 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c @@ -876,9 +876,8 @@ isdn_readbchan(int di, int channel, u_char *buf, u_char *fp, int len, wait_queue * of the mapping (di,ch)<->minor, happen during the sleep? --he */ int -isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack) +isdn_readbchan_tty(int di, int channel, struct tty_port *port, int cisco_hack) { - struct tty_port *port = tty->port; int count; int count_pull; int count_put; @@ -941,7 +940,7 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack) } count_put = count_pull; if (count_put > 1) - tty_insert_flip_string(tty, skb->data, count_put - 1); + tty_insert_flip_string(port, skb->data, count_put - 1); last = skb->data[count_put - 1]; len -= count_put; #ifdef CONFIG_ISDN_AUDIO diff --git a/drivers/isdn/i4l/isdn_common.h b/drivers/isdn/i4l/isdn_common.h index 9a471f62e1d4..2260ef07ab9c 100644 --- a/drivers/isdn/i4l/isdn_common.h +++ b/drivers/isdn/i4l/isdn_common.h @@ -37,7 +37,7 @@ extern void isdn_timer_ctrl(int tf, int onoff); extern void isdn_unexclusive_channel(int di, int ch); extern int isdn_getnum(char **); extern int isdn_readbchan(int, int, u_char *, u_char *, int, wait_queue_head_t *); -extern int isdn_readbchan_tty(int, int, struct tty_struct *, int); +extern int isdn_readbchan_tty(int, int, struct tty_port *, int); extern int isdn_get_free_channel(int, int, int, int, int, char *); extern int isdn_writebuf_skb_stub(int, int, int, struct sk_buff *); extern int register_isdn(isdn_if *i); diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index 32d65d4bc848..9bb9986659e4 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c @@ -101,7 +101,7 @@ isdn_tty_try_read(modem_info *info, struct sk_buff *skb) } else { #endif if (len > 1) - tty_insert_flip_string(tty, skb->data, len - 1); + tty_insert_flip_string(port, skb->data, len - 1); last = skb->data[len - 1]; #ifdef CONFIG_ISDN_AUDIO } @@ -150,9 +150,9 @@ isdn_tty_readmodem(void) if (info->mcr & UART_MCR_RTS) { /* CISCO AsyncPPP Hack */ if (!(info->emu.mdmreg[REG_CPPP] & BIT_CPPP)) - r = isdn_readbchan_tty(info->isdn_driver, info->isdn_channel, tty, 0); + r = isdn_readbchan_tty(info->isdn_driver, info->isdn_channel, &info->port, 0); else - r = isdn_readbchan_tty(info->isdn_driver, info->isdn_channel, tty, 1); + r = isdn_readbchan_tty(info->isdn_driver, info->isdn_channel, &info->port, 1); if (r) tty_flip_buffer_push(tty); } else |