diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-07-13 14:13:55 +0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-07-25 22:36:39 -0700 |
| commit | fa7c865ad999d6ca340bca471fab7f3a3e6ae011 (patch) | |
| tree | 01fb2d060c3dc37f9ff7e85f9f127f863c8fa5f4 | |
| parent | a6a3dd1aed31ace7c827236c53d83f4e845dcff2 (diff) | |
| download | linux-3.10-fa7c865ad999d6ca340bca471fab7f3a3e6ae011.tar.gz linux-3.10-fa7c865ad999d6ca340bca471fab7f3a3e6ae011.tar.bz2 linux-3.10-fa7c865ad999d6ca340bca471fab7f3a3e6ae011.zip | |
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 <shawn.guo@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | 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 648bdd05d38..8dabfe81d07 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); } } |