From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vineet Gupta Subject: [PATCH 2/2] serial/arc-uart: Remove the goto/label Date: Thu, 1 Aug 2013 21:49:20 -0700 Message-ID: <1375418960-21491-2-git-send-email-vgupta@synopsys.com> References: <1375418960-21491-1-git-send-email-vgupta@synopsys.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from vaxjo.synopsys.com ([198.182.60.75]:43654 "EHLO vaxjo.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755577Ab3HAQuK (ORCPT ); Thu, 1 Aug 2013 12:50:10 -0400 In-Reply-To: <1375418960-21491-1-git-send-email-vgupta@synopsys.com> Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: linux-serial@vger.kernel.org Cc: Mischa Jonker , Vineet Gupta , Greg Kroah-Hartman , Jiri Slaby , linux-kernel@vger.kernel.org Signed-off-by: Vineet Gupta Cc: Mischa Jonker Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/tty/serial/arc_uart.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c index 10f981b..c7aa313a 100644 --- a/drivers/tty/serial/arc_uart.c +++ b/drivers/tty/serial/arc_uart.c @@ -248,12 +248,9 @@ static void arc_serial_rx_chars(struct arc_uart_port *uart, unsigned int status) ch = UART_GET_DATA(uart); uart->port.icount.rx++; - if (unlikely(uart_handle_sysrq_char(&uart->port, ch))) - goto done; + if (!(uart_handle_sysrq_char(&uart->port, ch))) + uart_insert_char(&uart->port, status, RXOERR, ch, flg); - uart_insert_char(&uart->port, status, RXOERR, ch, flg); - -done: tty_flip_buffer_push(&uart->port.state->port); } while (!((status = UART_GET_STATUS(uart)) & RXEMPTY)); } -- 1.8.1.2