summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2014-04-21 09:40:36 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-24 15:38:22 -0700
commitf94b0572683716f727b25086f8d39671506593ab (patch)
treec1428aa4245d01149c008c70558b15a166c84d12 /drivers/tty
parentab88c8dc3bd667bcf21c8319165db92b930cf7e7 (diff)
serial: samsung: Change barrier() to cpu_relax() in console output
The two functions to write out to the console (one used in normal console mode and one in polling console mode) were slightly different. One used a barrier() in its loop and the other a cpu_relax(). The barrier() really doesn't do anything since we're using rd_regl() to read the port anyway. Switch it to cpu_relax() to make things consistent. No known bugs / issues are fixed by this change--it just makes things more consistent. Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/samsung.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 12442748d69..1f5505e7f90 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1466,7 +1466,7 @@ s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
unsigned int ufcon = rd_regl(port, S3C2410_UFCON);
while (!s3c24xx_serial_console_txrdy(port, ufcon))
- barrier();
+ cpu_relax();
wr_regb(port, S3C2410_UTXH, ch);
}