From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758375AbYAVOwb (ORCPT ); Tue, 22 Jan 2008 09:52:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759757AbYAVOvw (ORCPT ); Tue, 22 Jan 2008 09:51:52 -0500 Received: from nat-132.atmel.no ([80.232.32.132]:56181 "EHLO relay.atmel.no" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759266AbYAVOvw (ORCPT ); Tue, 22 Jan 2008 09:51:52 -0500 From: Haavard Skinnemoen To: Andrew Victor Cc: Remy Bohmer , linux-arm-kernel@lists.arm.linux.org.uk, linux-kernel@vger.kernel.org, kernel@avr32linux.org, Haavard Skinnemoen Subject: [PATCH 2/6] atmel_serial: Use cpu_relax() when busy-waiting Date: Tue, 22 Jan 2008 15:50:40 +0100 Message-Id: <1201013444-30370-3-git-send-email-hskinnemoen@atmel.com> X-Mailer: git-send-email debian.1.5.3.7.1-dirty In-Reply-To: <1201013444-30370-2-git-send-email-hskinnemoen@atmel.com> References: <1201013444-30370-1-git-send-email-hskinnemoen@atmel.com> <1201013444-30370-2-git-send-email-hskinnemoen@atmel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace two instances of barrier() with cpu_relax() since that's the right thing to do when busy-waiting. This does not actually change anything since cpu_relax() is defined as barrier() on both ARM and AVR32. Signed-off-by: Haavard Skinnemoen Acked-by: Andrew Victor --- drivers/serial/atmel_serial.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index dd4097a..991b01a 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -620,7 +620,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, imr = UART_GET_IMR(port); UART_PUT_IDR(port, -1); while (!(UART_GET_CSR(port) & ATMEL_US_TXEMPTY)) - barrier(); + cpu_relax(); /* disable receiver and transmitter */ UART_PUT_CR(port, ATMEL_US_TXDIS | ATMEL_US_RXDIS); @@ -799,7 +799,7 @@ void __init atmel_register_uart_fns(struct atmel_port_fns *fns) static void atmel_console_putchar(struct uart_port *port, int ch) { while (!(UART_GET_CSR(port) & ATMEL_US_TXRDY)) - barrier(); + cpu_relax(); UART_PUT_CHAR(port, ch); } -- 1.5.3.7