diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-10 23:39:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-28 23:07:04 +0100 |
| commit | cee10c8cd3fde3da428ffafd4eb8847892a34d52 (patch) | |
| tree | aa7b7daed8bcebf0b5b83435cc4c58ec6c59bfaf | |
| parent | serial: 8250: Wait for irq to complete before shutdown (diff) | |
| download | linux-cee10c8cd3fde3da428ffafd4eb8847892a34d52.tar.xz linux-cee10c8cd3fde3da428ffafd4eb8847892a34d52.zip | |
serial: 8250: Unfold < 80 char lines
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/8250/8250_port.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 57b3a80b4359..0bd3c6baa300 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1523,11 +1523,9 @@ void serial8250_tx_chars(struct uart_8250_port *up) port->icount.tx++; if (uart_circ_empty(xmit)) break; - if (up->capabilities & UART_CAP_HFIFO) { - if ((serial_port_in(port, UART_LSR) & BOTH_EMPTY) != - BOTH_EMPTY) - break; - } + if ((up->capabilities & UART_CAP_HFIFO) && + (serial_in(up, UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY) + break; } while (--count > 0); if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) @@ -2753,8 +2751,7 @@ serial8250_verify_port(struct uart_port *port, struct serial_struct *ser) return 0; } -static const char * -serial8250_type(struct uart_port *port) +static const char *serial8250_type(struct uart_port *port) { int type = port->type; |