All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lauri Hintsala <lauri.hintsala@bluegiga.com>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] ARM: mxs: fix compile error caused by prom_update_property change
Date: Thu, 26 Jul 2012 08:32:32 +0300	[thread overview]
Message-ID: <5010D670.6070303@bluegiga.com> (raw)
In-Reply-To: <1342160035-24170-1-git-send-email-shawn.guo@linaro.org>

Hi,

On 07/13/2012 09:13 AM, Shawn Guo wrote:
> The commit 475d009 (of: Improve prom_update_property() function)
> changed prom_update_property interface, and causes the compile
> error below.
>
>    CC      arch/arm/mach-mxs/mach-mxs.o
> arch/arm/mach-mxs/mach-mxs.c: In function ‘update_fec_mac_prop’:
> arch/arm/mach-mxs/mach-mxs.c:216:4: error: too many arguments to function ‘prom_update_property’
> include/linux/of.h:263:12: note: declared here
>
> Update the caller update_fec_mac_prop to fix the error.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> The error is seen on next-20120712 where commit 475d009 (of: Improve
> prom_update_property() function) emerges.

What's the status of this patch? Current Torvald's master is unbuildable 
for mxs because of this issue.

Compiler gives an error:
arch/arm/mach-mxs/mach-mxs.c: In function 'update_fec_mac_prop':
arch/arm/mach-mxs/mach-mxs.c:213: error: too many arguments to function 
'prom_update_property'
make[1]: *** [arch/arm/mach-mxs/mach-mxs.o] Error 1

Best regards,
Lauri Hintsala


>
>   arch/arm/mach-mxs/mach-mxs.c |    8 ++------
>   1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> index 648bdd0..8dabfe8 100644
> --- a/arch/arm/mach-mxs/mach-mxs.c
> +++ b/arch/arm/mach-mxs/mach-mxs.c
> @@ -162,7 +162,7 @@ enum mac_oui {
>   static void __init update_fec_mac_prop(enum mac_oui oui)
>   {
>   	struct device_node *np, *from = NULL;
> -	struct property *oldmac, *newmac;
> +	struct property *newmac;
>   	const u32 *ocotp = mxs_get_ocotp();
>   	u8 *macaddr;
>   	u32 val;
> @@ -208,11 +208,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
>   		macaddr[4] = (val >> 8) & 0xff;
>   		macaddr[5] = (val >> 0) & 0xff;
>
> -		oldmac = of_find_property(np, newmac->name, NULL);
> -		if (oldmac)
> -			prom_update_property(np, newmac, oldmac);
> -		else
> -			prom_add_property(np, newmac);
> +		prom_update_property(np, newmac);
>   	}
>   }
>
>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: lauri.hintsala@bluegiga.com (Lauri Hintsala)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: mxs: fix compile error caused by prom_update_property change
Date: Thu, 26 Jul 2012 08:32:32 +0300	[thread overview]
Message-ID: <5010D670.6070303@bluegiga.com> (raw)
In-Reply-To: <1342160035-24170-1-git-send-email-shawn.guo@linaro.org>

Hi,

On 07/13/2012 09:13 AM, Shawn Guo wrote:
> The commit 475d009 (of: Improve prom_update_property() function)
> changed prom_update_property interface, and causes the compile
> error below.
>
>    CC      arch/arm/mach-mxs/mach-mxs.o
> arch/arm/mach-mxs/mach-mxs.c: In function ?update_fec_mac_prop?:
> arch/arm/mach-mxs/mach-mxs.c:216:4: error: too many arguments to function ?prom_update_property?
> include/linux/of.h:263:12: note: declared here
>
> Update the caller update_fec_mac_prop to fix the error.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> The error is seen on next-20120712 where commit 475d009 (of: Improve
> prom_update_property() function) emerges.

What's the status of this patch? Current Torvald's master is unbuildable 
for mxs because of this issue.

Compiler gives an error:
arch/arm/mach-mxs/mach-mxs.c: In function 'update_fec_mac_prop':
arch/arm/mach-mxs/mach-mxs.c:213: error: too many arguments to function 
'prom_update_property'
make[1]: *** [arch/arm/mach-mxs/mach-mxs.o] Error 1

Best regards,
Lauri Hintsala


>
>   arch/arm/mach-mxs/mach-mxs.c |    8 ++------
>   1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> index 648bdd0..8dabfe8 100644
> --- a/arch/arm/mach-mxs/mach-mxs.c
> +++ b/arch/arm/mach-mxs/mach-mxs.c
> @@ -162,7 +162,7 @@ enum mac_oui {
>   static void __init update_fec_mac_prop(enum mac_oui oui)
>   {
>   	struct device_node *np, *from = NULL;
> -	struct property *oldmac, *newmac;
> +	struct property *newmac;
>   	const u32 *ocotp = mxs_get_ocotp();
>   	u8 *macaddr;
>   	u32 val;
> @@ -208,11 +208,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
>   		macaddr[4] = (val >> 8) & 0xff;
>   		macaddr[5] = (val >> 0) & 0xff;
>
> -		oldmac = of_find_property(np, newmac->name, NULL);
> -		if (oldmac)
> -			prom_update_property(np, newmac, oldmac);
> -		else
> -			prom_add_property(np, newmac);
> +		prom_update_property(np, newmac);
>   	}
>   }
>
>

  reply	other threads:[~2012-07-26  5:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-13  6:13 [PATCH] ARM: mxs: fix compile error caused by prom_update_property change Shawn Guo
2012-07-13  6:13 ` Shawn Guo
2012-07-26  5:32 ` Lauri Hintsala [this message]
2012-07-26  5:32   ` Lauri Hintsala
2012-07-26  5:38   ` Olof Johansson
2012-07-26  5:38     ` Olof Johansson

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=5010D670.6070303@bluegiga.com \
    --to=lauri.hintsala@bluegiga.com \
    --cc=arnd@arndb.de \
    --cc=fabio.estevam@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=shawn.guo@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.