aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/i4l/isdn_tty.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2013-01-03 09:53:03 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 01:21:36 -0500
commit92a19f9cec9a80ad93c06e115822deb729e2c6ad (patch)
tree80e1550ac1647a1cdf20a0b568554c0c50a63f75 /drivers/isdn/i4l/isdn_tty.c
parent2f69335710884ae6112fc8196ebe29b5cda7b79b (diff)
TTY: switch tty_insert_flip_char
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_char is the next one to proceed. This one is used all over the code, so the patch is huge. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn/i4l/isdn_tty.c')
-rw-r--r--drivers/isdn/i4l/isdn_tty.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 4f5bcee7cf32..32d65d4bc848 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -92,11 +92,11 @@ isdn_tty_try_read(modem_info *info, struct sk_buff *skb)
92 unsigned char *dp = skb->data; 92 unsigned char *dp = skb->data;
93 while (--l) { 93 while (--l) {
94 if (*dp == DLE) 94 if (*dp == DLE)
95 tty_insert_flip_char(tty, DLE, 0); 95 tty_insert_flip_char(port, DLE, 0);
96 tty_insert_flip_char(tty, *dp++, 0); 96 tty_insert_flip_char(port, *dp++, 0);
97 } 97 }
98 if (*dp == DLE) 98 if (*dp == DLE)
99 tty_insert_flip_char(tty, DLE, 0); 99 tty_insert_flip_char(port, DLE, 0);
100 last = *dp; 100 last = *dp;
101 } else { 101 } else {
102#endif 102#endif
@@ -107,9 +107,9 @@ isdn_tty_try_read(modem_info *info, struct sk_buff *skb)
107 } 107 }
108#endif 108#endif
109 if (info->emu.mdmreg[REG_CPPP] & BIT_CPPP) 109 if (info->emu.mdmreg[REG_CPPP] & BIT_CPPP)
110 tty_insert_flip_char(tty, last, 0xFF); 110 tty_insert_flip_char(port, last, 0xFF);
111 else 111 else
112 tty_insert_flip_char(tty, last, TTY_NORMAL); 112 tty_insert_flip_char(port, last, TTY_NORMAL);
113 tty_flip_buffer_push(tty); 113 tty_flip_buffer_push(tty);
114 kfree_skb(skb); 114 kfree_skb(skb);
115 115
@@ -2287,7 +2287,7 @@ isdn_tty_at_cout(char *msg, modem_info *info)
2287 if (skb) { 2287 if (skb) {
2288 *sp++ = c; 2288 *sp++ = c;
2289 } else { 2289 } else {
2290 if (tty_insert_flip_char(tty, c, TTY_NORMAL) == 0) 2290 if (tty_insert_flip_char(port, c, TTY_NORMAL) == 0)
2291 break; 2291 break;
2292 } 2292 }
2293 } 2293 }