aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
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/mmc
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/mmc')
-rw-r--r--drivers/mmc/card/sdio_uart.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c
index bd57a11acc79..894078be0b96 100644
--- a/drivers/mmc/card/sdio_uart.c
+++ b/drivers/mmc/card/sdio_uart.c
@@ -419,7 +419,7 @@ static void sdio_uart_receive_chars(struct sdio_uart_port *port,
419 419
420 if ((*status & port->ignore_status_mask & ~UART_LSR_OE) == 0) 420 if ((*status & port->ignore_status_mask & ~UART_LSR_OE) == 0)
421 if (tty) 421 if (tty)
422 tty_insert_flip_char(tty, ch, flag); 422 tty_insert_flip_char(&port->port, ch, flag);
423 423
424 /* 424 /*
425 * Overrun is special. Since it's reported immediately, 425 * Overrun is special. Since it's reported immediately,
@@ -427,7 +427,8 @@ static void sdio_uart_receive_chars(struct sdio_uart_port *port,
427 */ 427 */
428 if (*status & ~port->ignore_status_mask & UART_LSR_OE) 428 if (*status & ~port->ignore_status_mask & UART_LSR_OE)
429 if (tty) 429 if (tty)
430 tty_insert_flip_char(tty, 0, TTY_OVERRUN); 430 tty_insert_flip_char(&port->port, 0,
431 TTY_OVERRUN);
431 432
432 *status = sdio_in(port, UART_LSR); 433 *status = sdio_in(port, UART_LSR);
433 } while ((*status & UART_LSR_DR) && (max_count-- > 0)); 434 } while ((*status & UART_LSR_DR) && (max_count-- > 0));