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/tty/serial/lpc32xx_hs.c | |
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/tty/serial/lpc32xx_hs.c')
-rw-r--r-- | drivers/tty/serial/lpc32xx_hs.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c index 0e86bff3fe2a..5cd180564c03 100644 --- a/drivers/tty/serial/lpc32xx_hs.c +++ b/drivers/tty/serial/lpc32xx_hs.c | |||
@@ -257,8 +257,9 @@ static void __serial_uart_flush(struct uart_port *port) | |||
257 | 257 | ||
258 | static void __serial_lpc32xx_rx(struct uart_port *port) | 258 | static void __serial_lpc32xx_rx(struct uart_port *port) |
259 | { | 259 | { |
260 | struct tty_port *tport = &port->state->port; | ||
260 | unsigned int tmp, flag; | 261 | unsigned int tmp, flag; |
261 | struct tty_struct *tty = tty_port_tty_get(&port->state->port); | 262 | struct tty_struct *tty = tty_port_tty_get(tport); |
262 | 263 | ||
263 | if (!tty) { | 264 | if (!tty) { |
264 | /* Discard data: no tty available */ | 265 | /* Discard data: no tty available */ |
@@ -281,10 +282,10 @@ static void __serial_lpc32xx_rx(struct uart_port *port) | |||
281 | LPC32XX_HSUART_IIR(port->membase)); | 282 | LPC32XX_HSUART_IIR(port->membase)); |
282 | port->icount.frame++; | 283 | port->icount.frame++; |
283 | flag = TTY_FRAME; | 284 | flag = TTY_FRAME; |
284 | tty_insert_flip_char(tty, 0, TTY_FRAME); | 285 | tty_insert_flip_char(tport, 0, TTY_FRAME); |
285 | } | 286 | } |
286 | 287 | ||
287 | tty_insert_flip_char(tty, (tmp & 0xFF), flag); | 288 | tty_insert_flip_char(tport, (tmp & 0xFF), flag); |
288 | 289 | ||
289 | tmp = readl(LPC32XX_HSUART_FIFO(port->membase)); | 290 | tmp = readl(LPC32XX_HSUART_FIFO(port->membase)); |
290 | } | 291 | } |
@@ -332,7 +333,8 @@ exit_tx: | |||
332 | static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id) | 333 | static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id) |
333 | { | 334 | { |
334 | struct uart_port *port = dev_id; | 335 | struct uart_port *port = dev_id; |
335 | struct tty_struct *tty = tty_port_tty_get(&port->state->port); | 336 | struct tty_port *port = &port->state->port; |
337 | struct tty_struct *tty = tty_port_tty_get(tport); | ||
336 | u32 status; | 338 | u32 status; |
337 | 339 | ||
338 | spin_lock(&port->lock); | 340 | spin_lock(&port->lock); |
@@ -356,8 +358,8 @@ static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id) | |||
356 | writel(LPC32XX_HSU_RX_OE_INT, | 358 | writel(LPC32XX_HSU_RX_OE_INT, |
357 | LPC32XX_HSUART_IIR(port->membase)); | 359 | LPC32XX_HSUART_IIR(port->membase)); |
358 | port->icount.overrun++; | 360 | port->icount.overrun++; |
361 | tty_insert_flip_char(tport, 0, TTY_OVERRUN); | ||
359 | if (tty) { | 362 | if (tty) { |
360 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | ||
361 | tty_schedule_flip(tty); | 363 | tty_schedule_flip(tty); |
362 | } | 364 | } |
363 | } | 365 | } |