From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: mx28: Remove duplicate OCOTP error message
Date: Mon, 23 Jan 2012 16:36:21 +0100 [thread overview]
Message-ID: <201201231636.21370.marek.vasut@gmail.com> (raw)
In-Reply-To: <1327332593-27534-1-git-send-email-fabio.estevam@freescale.com>
> 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>
> ---
> arch/arm/mach-mxs/mach-m28evk.c | 5 +----
> arch/arm/mach-mxs/mach-mx28evk.c | 6 +-----
> 2 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/mach-m28evk.c
> b/arch/arm/mach-mxs/mach-m28evk.c index 2f27582..eec1257 100644
> --- 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 fdb0a56..f1cbf34 100644
> --- 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;
> }
>
> /*
Looks sane :-)
Acked-by: Marek Vasut <marek.vasut@gmail.com>
next prev parent reply other threads:[~2012-01-23 15:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 15:29 [PATCH] ARM: mx28: Remove duplicate OCOTP error message Fabio Estevam
2012-01-23 15:36 ` Marek Vasut [this message]
2012-01-23 15:50 ` Stefano Babic
2012-01-26 12:33 ` Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201201231636.21370.marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).