Skip to content

Commit

Permalink
ARM: mx28: Remove duplicate OCOTP error message
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fabio Estevam authored and Shawn Guo committed Jan 31, 2012
1 parent 845da6b commit 9250bc8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
5 changes: 1 addition & 4 deletions arch/arm/mach-mxs/mach-m28evk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 1 addition & 5 deletions arch/arm/mach-mxs/mach-mx28evk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
}

/*
Expand Down

0 comments on commit 9250bc8

Please sign in to comment.