Skip to content

Commit

Permalink
serial: remove back and forth conversions in serial_out_sync
Browse files Browse the repository at this point in the history
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: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Paul Gortmaker authored and Greg Kroah-Hartman committed Mar 9, 2012
1 parent 4fd996a commit 55e4016
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/tty/serial/8250/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 55e4016

Please sign in to comment.