Skip to content

Commit

Permalink
serial: samsung: don't check config for every character
Browse files Browse the repository at this point in the history
The s3c24xx_serial_console_putchar() is _only_ ever used by
s3c24xx_serial_console_write() and is called in a loop (indirectly
through uart_console_write()).  There's no reason to call
s3c24xx_port_configured() for every iteration through the loop.  Move
it outside the loop.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Doug Anderson authored and Greg Kroah-Hartman committed Apr 24, 2014
1 parent bb7f09b commit ab88c8d
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/tty/serial/samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -1464,11 +1464,6 @@ static void
s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
{
unsigned int ufcon = rd_regl(port, S3C2410_UFCON);
unsigned int ucon = rd_regl(port, S3C2410_UCON);

/* not possible to xmit on unconfigured port */
if (!s3c24xx_port_configured(ucon))
return;

while (!s3c24xx_serial_console_txrdy(port, ufcon))
barrier();
Expand All @@ -1479,6 +1474,12 @@ static void
s3c24xx_serial_console_write(struct console *co, const char *s,
unsigned int count)
{
unsigned int ucon = rd_regl(cons_uart, S3C2410_UCON);

/* not possible to xmit on unconfigured port */
if (!s3c24xx_port_configured(ucon))
return;

uart_console_write(cons_uart, s, count, s3c24xx_serial_console_putchar);
}

Expand Down

0 comments on commit ab88c8d

Please sign in to comment.