mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

ARM: mx28: Remove duplicate OCOTP error message

Browse source 
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>
This commit is contained in:
Fabio Estevam 2012-01-23 13:29:53 -02:00 committed by Shawn Guo
parent 845da6bf65
commit 9250bc8b76
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/mach-mxs/mach-m28evk.c
View file

@ -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,

6
arch/arm/mach-mxs/mach-mx28evk.c
View file

@ -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;
}
/*