* [PATCH] ARM: mxs: fix compile error caused by prom_update_property change
@ 2012-07-13 6:13 Shawn Guo
2012-07-26 5:32 ` Lauri Hintsala
0 siblings, 1 reply; 3+ messages in thread
From: Shawn Guo @ 2012-07-13 6:13 UTC (permalink / raw)
To: linux-arm-kernel
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.
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);
}
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] ARM: mxs: fix compile error caused by prom_update_property change
2012-07-13 6:13 [PATCH] ARM: mxs: fix compile error caused by prom_update_property change Shawn Guo
@ 2012-07-26 5:32 ` Lauri Hintsala
2012-07-26 5:38 ` Olof Johansson
0 siblings, 1 reply; 3+ messages in thread
From: Lauri Hintsala @ 2012-07-26 5:32 UTC (permalink / raw)
To: linux-arm-kernel
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);
> }
> }
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] ARM: mxs: fix compile error caused by prom_update_property change
2012-07-26 5:32 ` Lauri Hintsala
@ 2012-07-26 5:38 ` Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2012-07-26 5:38 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jul 25, 2012 at 10:32 PM, Lauri Hintsala
<lauri.hintsala@bluegiga.com> wrote:
> 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
Thanks for the follow-up, I had missed it when first sent out. I've
applied it to our fixes branch that will be sent out shortly.
-Olof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-26 5:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-13 6:13 [PATCH] ARM: mxs: fix compile error caused by prom_update_property change Shawn Guo
2012-07-26 5:32 ` Lauri Hintsala
2012-07-26 5:38 ` Olof Johansson
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).