summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/mach-mx28evk.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-01-23 13:29:53 -0200
committerShawn Guo <shawn.guo@linaro.org>2012-01-31 22:39:19 +0800
commit9250bc8b76bd7e89a9891c9a862aa3eea7bcfb8e (patch)
treed3ae43b63673b61055d1b72bd6033fc6fdbadfed /arch/arm/mach-mxs/mach-mx28evk.c
parent845da6bf65b1ebff700c1e9a8c17f5df303792c1 (diff)
ARM: mx28: Remove duplicate OCOTP error message
The mxs_get_ocotp() function already prints an error message in the case of a timeout, so no need to print them again in the board files. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/mach-mx28evk.c')
-rw-r--r--arch/arm/mach-mxs/mach-mx28evk.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index fdb0a5664dd..f1cbf34aeb4 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -278,7 +278,7 @@ static int __init mx28evk_fec_get_mac(void)
const u32 *ocotp = mxs_get_ocotp();
if (!ocotp)
- goto error;
+ return -ETIMEDOUT;
/*
* OCOTP only stores the last 4 octets for each mac address,
@@ -295,10 +295,6 @@ static int __init mx28evk_fec_get_mac(void)
}
return 0;
-
-error:
- pr_err("%s: timeout when reading fec mac from OCOTP\n", __func__);
- return -ETIMEDOUT;
}
/*