Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9250bc8b authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Acked-by: default avatarStefano Babic <sbabic@denx.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 845da6bf

arch/arm/mach-mxs/mach-m28evk.c

+1 −4
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-mxs/mach-mx28evk.c

+1 −5
Original line number Diff line number Diff line
@@ -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;

}



/*