ARM: mxs: fix compile error caused by prom_update_property change

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 <[email protected]>

---
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(-)

arch/arm/mach-mxs/mach-mxs.c +2 -6

index 648bdd0..8dabfe8 100644
@@ -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);
  	}
  }
 

Hi,

Quoted 11 lines · Shawn Guo

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

Quoted 6 lines

Update the caller update_fec_mac_prop to fix the error.

Signed-off-by Shawn Guo <[email protected]>

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