diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-10 17:39:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-28 17:07:04 -0500 |
| commit | cee10c8cd3fde3da428ffafd4eb8847892a34d52 (patch) | |
| tree | aa7b7daed8bcebf0b5b83435cc4c58ec6c59bfaf /drivers/tty/serial/8250 | |
| parent | 611e0d83a83724340d4bf0eed610af01401b2ff4 (diff) | |
serial: 8250: Unfold < 80 char lines
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250')
| -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) | |||
| 1523 | port->icount.tx++; | 1523 | port->icount.tx++; |
| 1524 | if (uart_circ_empty(xmit)) | 1524 | if (uart_circ_empty(xmit)) |
| 1525 | break; | 1525 | break; |
| 1526 | if (up->capabilities & UART_CAP_HFIFO) { | 1526 | if ((up->capabilities & UART_CAP_HFIFO) && |
| 1527 | if ((serial_port_in(port, UART_LSR) & BOTH_EMPTY) != | 1527 | (serial_in(up, UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY) |
| 1528 | BOTH_EMPTY) | 1528 | break; |
| 1529 | break; | ||
| 1530 | } | ||
| 1531 | } while (--count > 0); | 1529 | } while (--count > 0); |
| 1532 | 1530 | ||
| 1533 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) | 1531 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) |
| @@ -2753,8 +2751,7 @@ serial8250_verify_port(struct uart_port *port, struct serial_struct *ser) | |||
| 2753 | return 0; | 2751 | return 0; |
| 2754 | } | 2752 | } |
| 2755 | 2753 | ||
| 2756 | static const char * | 2754 | static const char *serial8250_type(struct uart_port *port) |
| 2757 | serial8250_type(struct uart_port *port) | ||
| 2758 | { | 2755 | { |
| 2759 | int type = port->type; | 2756 | int type = port->type; |
| 2760 | 2757 | ||