summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-10-27 14:49:38 -0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-05 20:03:20 -0800
commitcb0f0a5ff43c1ae05c6d696857c42dceb0cda7f8 (patch)
tree68334c6b34d167f08fb9ff95f4e8e805b8752572
parentc0d1c6b0f0dc731b1b17f48876f048af36ad3ce8 (diff)
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>
-rw-r--r--drivers/tty/serial/imx.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index e4a2846f34a6..e7dc2102bb27 100644
--- 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)