]> git.karo-electronics.de Git - linux-beck.git/commitdiff
tty: Move serial8250_stop_rx() in front of serial8250_start_tx()
authorMatwey V. Kornilov <matwey@sai.msu.ru>
Mon, 1 Feb 2016 18:09:20 +0000 (21:09 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 7 Feb 2016 06:23:26 +0000 (22:23 -0800)
Software RS485 emultaion is to be added in the following commit.
serial8250_start_tx() will need to refer serial8250_stop_rx().
Move serial8250_stop_rx() in front of serial8250_start_tx() in order
to avoid function forward declaration.

Signed-off-by: Matwey V. Kornilov <matwey@sai.msu.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_port.c

index 0bd3c6baa3008f0b82ca24d22efa72e852f097a5..04681e5745de6133d3f4410a56e0c4ab09584d20 100644 (file)
@@ -1304,6 +1304,19 @@ static void autoconfig_irq(struct uart_8250_port *up)
        port->irq = (irq > 0) ? irq : 0;
 }
 
+static void serial8250_stop_rx(struct uart_port *port)
+{
+       struct uart_8250_port *up = up_to_u8250p(port);
+
+       serial8250_rpm_get(up);
+
+       up->ier &= ~(UART_IER_RLSI | UART_IER_RDI);
+       up->port.read_status_mask &= ~UART_LSR_DR;
+       serial_port_out(port, UART_IER, up->ier);
+
+       serial8250_rpm_put(up);
+}
+
 static inline void __stop_tx(struct uart_8250_port *p)
 {
        if (p->ier & UART_IER_THRI) {
@@ -1371,19 +1384,6 @@ static void serial8250_unthrottle(struct uart_port *port)
        port->unthrottle(port);
 }
 
-static void serial8250_stop_rx(struct uart_port *port)
-{
-       struct uart_8250_port *up = up_to_u8250p(port);
-
-       serial8250_rpm_get(up);
-
-       up->ier &= ~(UART_IER_RLSI | UART_IER_RDI);
-       up->port.read_status_mask &= ~UART_LSR_DR;
-       serial_port_out(port, UART_IER, up->ier);
-
-       serial8250_rpm_put(up);
-}
-
 static void serial8250_disable_ms(struct uart_port *port)
 {
        struct uart_8250_port *up =