From 9250bc8b76bd7e89a9891c9a862aa3eea7bcfb8e Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 23 Jan 2012 13:29:53 -0200 Subject: 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 Acked-by: Marek Vasut Acked-by: Stefano Babic Signed-off-by: Shawn Guo --- arch/arm/mach-mxs/mach-m28evk.c | 5 +---- arch/arm/mach-mxs/mach-mx28evk.c | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-mxs/mach-m28evk.c b/arch/arm/mach-mxs/mach-m28evk.c index 2f2758230edf..eec1257e7f97 100644 --- a/arch/arm/mach-mxs/mach-m28evk.c +++ b/arch/arm/mach-mxs/mach-m28evk.c @@ -247,11 +247,8 @@ static int __init m28evk_fec_get_mac(void) u32 val; const u32 *ocotp = mxs_get_ocotp(); - if (!ocotp) { - pr_err("%s: timeout when reading fec mac from OCOTP\n", - __func__); + if (!ocotp) return -ETIMEDOUT; - } /* * OCOTP only stores the last 4 octets for each mac address, diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index fdb0a5664dd6..f1cbf34aeb44 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; } /* -- cgit v1.2.3-59-g8ed1b