From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Date: Fri, 2 Aug 2013 04:49:20 +0000 (-0700)
Subject: serial/arc-uart: Remove the goto/label
X-Git-Tag: upstream/snapshot3+hdmi~4472^2~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00a135b3952f6ccedfb688919c59bb3fa199a11f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

serial/arc-uart: Remove the goto/label

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Cc: Mischa Jonker <mjonker@synopsys.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/arc_uart.c b/drivers/tty/serial/arc_uart.c
index e296c89..6ac5270 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));
 }