diff options
author | Jiri Slaby <jslaby@suse.cz> | 2013-01-03 09:53:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 01:21:36 -0500 |
commit | 92a19f9cec9a80ad93c06e115822deb729e2c6ad (patch) | |
tree | 80e1550ac1647a1cdf20a0b568554c0c50a63f75 /drivers/ipack | |
parent | 2f69335710884ae6112fc8196ebe29b5cda7b79b (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/ipack')
-rw-r--r-- | drivers/ipack/devices/ipoctal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c index 576d53d92677..8e0ed663ba9b 100644 --- a/drivers/ipack/devices/ipoctal.c +++ b/drivers/ipack/devices/ipoctal.c | |||
@@ -136,6 +136,7 @@ static int ipoctal_get_icount(struct tty_struct *tty, | |||
136 | static void ipoctal_irq_rx(struct ipoctal_channel *channel, | 136 | static void ipoctal_irq_rx(struct ipoctal_channel *channel, |
137 | struct tty_struct *tty, u8 sr) | 137 | struct tty_struct *tty, u8 sr) |
138 | { | 138 | { |
139 | struct tty_port *port = &channel->tty_port; | ||
139 | unsigned char value; | 140 | unsigned char value; |
140 | unsigned char flag = TTY_NORMAL; | 141 | unsigned char flag = TTY_NORMAL; |
141 | u8 isr; | 142 | u8 isr; |
@@ -149,7 +150,7 @@ static void ipoctal_irq_rx(struct ipoctal_channel *channel, | |||
149 | if (sr & SR_OVERRUN_ERROR) { | 150 | if (sr & SR_OVERRUN_ERROR) { |
150 | channel->stats.overrun_err++; | 151 | channel->stats.overrun_err++; |
151 | /* Overrun doesn't affect the current character*/ | 152 | /* Overrun doesn't affect the current character*/ |
152 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | 153 | tty_insert_flip_char(port, 0, TTY_OVERRUN); |
153 | } | 154 | } |
154 | if (sr & SR_PARITY_ERROR) { | 155 | if (sr & SR_PARITY_ERROR) { |
155 | channel->stats.parity_err++; | 156 | channel->stats.parity_err++; |
@@ -165,7 +166,7 @@ static void ipoctal_irq_rx(struct ipoctal_channel *channel, | |||
165 | flag = TTY_BREAK; | 166 | flag = TTY_BREAK; |
166 | } | 167 | } |
167 | } | 168 | } |
168 | tty_insert_flip_char(tty, value, flag); | 169 | tty_insert_flip_char(port, value, flag); |
169 | 170 | ||
170 | /* Check if there are more characters in RX FIFO | 171 | /* Check if there are more characters in RX FIFO |
171 | * If there are more, the isr register for this channel | 172 | * If there are more, the isr register for this channel |