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>

diff --git a/arch/arm/mach-mxs/mach-m28evk.c b/arch/arm/mach-mxs/mach-m28evk.c
index 2f2758230edf83f4cd98ae5a80817dd2b6c4e0ad..eec1257e7f9798d1e66fea596c56a2ae4acb0099 100644 (file)
--- 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 fdb0a5664dd68f7af7b6158c9db5ca94ffc1e174..f1cbf34aeb44283030cd1a3eb570ac606e963d95 100644 (file)
--- 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;
 }
 
 /*