Commit fa7c865a authored by Shawn Guo's avatar Shawn Guo Committed by Olof Johansson

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: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent a6a3dd1a
...@@ -162,7 +162,7 @@ enum mac_oui { ...@@ -162,7 +162,7 @@ enum mac_oui {
static void __init update_fec_mac_prop(enum mac_oui oui) static void __init update_fec_mac_prop(enum mac_oui oui)
{ {
struct device_node *np, *from = NULL; struct device_node *np, *from = NULL;
struct property *oldmac, *newmac; struct property *newmac;
const u32 *ocotp = mxs_get_ocotp(); const u32 *ocotp = mxs_get_ocotp();
u8 *macaddr; u8 *macaddr;
u32 val; u32 val;
...@@ -208,11 +208,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui) ...@@ -208,11 +208,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
macaddr[4] = (val >> 8) & 0xff; macaddr[4] = (val >> 8) & 0xff;
macaddr[5] = (val >> 0) & 0xff; macaddr[5] = (val >> 0) & 0xff;
oldmac = of_find_property(np, newmac->name, NULL); prom_update_property(np, newmac);
if (oldmac)
prom_update_property(np, newmac, oldmac);
else
prom_add_property(np, newmac);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment