serial: imx: Remove unneeded goto label

Instead of jumping to 'error_out1' label we can simplify the code and return the
error code directly.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index e4a2846f34a6e221e6f382ba9eea8ba4ff2927ca..e7dc2102bb27ec57f0c0e170655ee821108c4409 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1076,11 +1076,11 @@ static int imx_startup(struct uart_port *port)
 
        retval = clk_prepare_enable(sport->clk_per);
        if (retval)
-               goto error_out1;
+               return retval;
        retval = clk_prepare_enable(sport->clk_ipg);
        if (retval) {
                clk_disable_unprepare(sport->clk_per);
-               goto error_out1;
+               return retval;
        }
 
        imx_setup_ufcr(sport, 0);
@@ -1170,9 +1170,6 @@ static int imx_startup(struct uart_port *port)
        }
 
        return 0;
-
-error_out1:
-       return retval;
 }
 
 static void imx_shutdown(struct uart_port *port)