aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-07-13 02:13:55 -0400
committerOlof Johansson <olof@lixom.net>2012-07-26 01:36:39 -0400
commitfa7c865ad999d6ca340bca471fab7f3a3e6ae011 (patch)
tree01fb2d060c3dc37f9ff7e85f9f127f863c8fa5f4
parenta6a3dd1aed31ace7c827236c53d83f4e845dcff2 (diff)
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.c8
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 648bdd05d38b..8dabfe81d07c 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -162,7 +162,7 @@ enum mac_oui {
162static void __init update_fec_mac_prop(enum mac_oui oui) 162static void __init update_fec_mac_prop(enum mac_oui oui)
163{ 163{
164 struct device_node *np, *from = NULL; 164 struct device_node *np, *from = NULL;
165 struct property *oldmac, *newmac; 165 struct property *newmac;
166 const u32 *ocotp = mxs_get_ocotp(); 166 const u32 *ocotp = mxs_get_ocotp();
167 u8 *macaddr; 167 u8 *macaddr;
168 u32 val; 168 u32 val;
@@ -208,11 +208,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
208 macaddr[4] = (val >> 8) & 0xff; 208 macaddr[4] = (val >> 8) & 0xff;
209 macaddr[5] = (val >> 0) & 0xff; 209 macaddr[5] = (val >> 0) & 0xff;
210 210
211 oldmac = of_find_property(np, newmac->name, NULL); 211 prom_update_property(np, newmac);
212 if (oldmac)
213 prom_update_property(np, newmac, oldmac);
214 else
215 prom_add_property(np, newmac);
216 } 212 }
217} 213}
218 214