From 07c3c295b319fe3607c3be0d654527dc760e830f Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 23 Jan 2012 13:29:53 -0200 Subject: [PATCH] --- yaml --- r: 295880 b: refs/heads/master c: 9250bc8b76bd7e89a9891c9a862aa3eea7bcfb8e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mxs/mach-m28evk.c | 5 +---- trunk/arch/arm/mach-mxs/mach-mx28evk.c | 6 +----- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 10913e87f555..2be6d3bce82c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 845da6bf65b1ebff700c1e9a8c17f5df303792c1 +refs/heads/master: 9250bc8b76bd7e89a9891c9a862aa3eea7bcfb8e diff --git a/trunk/arch/arm/mach-mxs/mach-m28evk.c b/trunk/arch/arm/mach-mxs/mach-m28evk.c index 2f2758230edf..eec1257e7f97 100644 --- a/trunk/arch/arm/mach-mxs/mach-m28evk.c +++ b/trunk/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/trunk/arch/arm/mach-mxs/mach-mx28evk.c b/trunk/arch/arm/mach-mxs/mach-mx28evk.c index fdb0a5664dd6..f1cbf34aeb44 100644 --- a/trunk/arch/arm/mach-mxs/mach-mx28evk.c +++ b/trunk/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; } /*