Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55e4016d authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman
Browse files

serial: remove back and forth conversions in serial_out_sync 



The two callers to serial_out_sync() have a struct port right
there in scope, but then pass in a struct 8250_port which then
is locally resolved back to a struct port.

Delete the needless back and forth and just pass in the struct
port directly.  Rename the function to have "_port" in its
name, so the name <--> args relationship is consistent with the
other serial_in/out vs serial_port_in/out function classes.

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4fd996a1

drivers/tty/serial/8250/8250.c

+3 −4
Original line number Diff line number Diff line
@@ -467,9 +467,8 @@ static void set_io_from_upio(struct uart_port *p) 
}



static void

serial_out_sync(struct uart_8250_port *up, int offset, int value)

serial_port_out_sync(struct uart_port *p, int offset, int value)

{

	struct uart_port *p = &up->port;

	switch (p->iotype) {

	case UPIO_MEM:

	case UPIO_MEM32:
@@ -2024,11 +2023,11 @@ static int serial8250_startup(struct uart_port *port) 
			disable_irq_nosync(port->irq);



		wait_for_xmitr(up, UART_LSR_THRE);

		serial_out_sync(up, UART_IER, UART_IER_THRI);

		serial_port_out_sync(port, UART_IER, UART_IER_THRI);

		udelay(1); /* allow THRE to set */

		iir1 = serial_port_in(port, UART_IIR);

		serial_port_out(port, UART_IER, 0);

		serial_out_sync(up, UART_IER, UART_IER_THRI);

		serial_port_out_sync(port, UART_IER, UART_IER_THRI);

		udelay(1); /* allow a working UART time to re-assert THRE */

		iir = serial_port_in(port, UART_IIR);

		serial_port_out(port, UART_IER, 0);