From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lauri Hintsala Subject: Re: [PATCH] ARM: mxs: fix compile error caused by prom_update_property change Date: Thu, 26 Jul 2012 08:32:32 +0300 Message-ID: <5010D670.6070303@bluegiga.com> References: <1342160035-24170-1-git-send-email-shawn.guo@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1342160035-24170-1-git-send-email-shawn.guo@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Shawn Guo Cc: Fabio Estevam , Stephen Rothwell , Arnd Bergmann , linux-next@vger.kernel.org, Olof Johansson , linux-arm-kernel@lists.infradead.org List-Id: linux-next.vger.kernel.org SGksCgpPbiAwNy8xMy8yMDEyIDA5OjEzIEFNLCBTaGF3biBHdW8gd3JvdGU6Cj4gVGhlIGNvbW1p dCA0NzVkMDA5IChvZjogSW1wcm92ZSBwcm9tX3VwZGF0ZV9wcm9wZXJ0eSgpIGZ1bmN0aW9uKQo+ IGNoYW5nZWQgcHJvbV91cGRhdGVfcHJvcGVydHkgaW50ZXJmYWNlLCBhbmQgY2F1c2VzIHRoZSBj b21waWxlCj4gZXJyb3IgYmVsb3cuCj4KPiAgICBDQyAgICAgIGFyY2gvYXJtL21hY2gtbXhzL21h Y2gtbXhzLm8KPiBhcmNoL2FybS9tYWNoLW14cy9tYWNoLW14cy5jOiBJbiBmdW5jdGlvbiDigJh1 cGRhdGVfZmVjX21hY19wcm9w4oCZOgo+IGFyY2gvYXJtL21hY2gtbXhzL21hY2gtbXhzLmM6MjE2 OjQ6IGVycm9yOiB0b28gbWFueSBhcmd1bWVudHMgdG8gZnVuY3Rpb24g4oCYcHJvbV91cGRhdGVf cHJvcGVydHnigJkKPiBpbmNsdWRlL2xpbnV4L29mLmg6MjYzOjEyOiBub3RlOiBkZWNsYXJlZCBo ZXJlCj4KPiBVcGRhdGUgdGhlIGNhbGxlciB1cGRhdGVfZmVjX21hY19wcm9wIHRvIGZpeCB0aGUg ZXJyb3IuCj4KPiBTaWduZWQtb2ZmLWJ5OiBTaGF3biBHdW8gPHNoYXduLmd1b0BsaW5hcm8ub3Jn Pgo+IC0tLQo+IFRoZSBlcnJvciBpcyBzZWVuIG9uIG5leHQtMjAxMjA3MTIgd2hlcmUgY29tbWl0 IDQ3NWQwMDkgKG9mOiBJbXByb3ZlCj4gcHJvbV91cGRhdGVfcHJvcGVydHkoKSBmdW5jdGlvbikg ZW1lcmdlcy4KCldoYXQncyB0aGUgc3RhdHVzIG9mIHRoaXMgcGF0Y2g/IEN1cnJlbnQgVG9ydmFs ZCdzIG1hc3RlciBpcyB1bmJ1aWxkYWJsZSAKZm9yIG14cyBiZWNhdXNlIG9mIHRoaXMgaXNzdWUu CgpDb21waWxlciBnaXZlcyBhbiBlcnJvcjoKYXJjaC9hcm0vbWFjaC1teHMvbWFjaC1teHMuYzog SW4gZnVuY3Rpb24gJ3VwZGF0ZV9mZWNfbWFjX3Byb3AnOgphcmNoL2FybS9tYWNoLW14cy9tYWNo LW14cy5jOjIxMzogZXJyb3I6IHRvbyBtYW55IGFyZ3VtZW50cyB0byBmdW5jdGlvbiAKJ3Byb21f dXBkYXRlX3Byb3BlcnR5JwptYWtlWzFdOiAqKiogW2FyY2gvYXJtL21hY2gtbXhzL21hY2gtbXhz Lm9dIEVycm9yIDEKCkJlc3QgcmVnYXJkcywKTGF1cmkgSGludHNhbGEKCgo+Cj4gICBhcmNoL2Fy bS9tYWNoLW14cy9tYWNoLW14cy5jIHwgICAgOCArKy0tLS0tLQo+ICAgMSBmaWxlcyBjaGFuZ2Vk LCAyIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvYXJjaC9h cm0vbWFjaC1teHMvbWFjaC1teHMuYyBiL2FyY2gvYXJtL21hY2gtbXhzL21hY2gtbXhzLmMKPiBp bmRleCA2NDhiZGQwLi44ZGFiZmU4IDEwMDY0NAo+IC0tLSBhL2FyY2gvYXJtL21hY2gtbXhzL21h Y2gtbXhzLmMKPiArKysgYi9hcmNoL2FybS9tYWNoLW14cy9tYWNoLW14cy5jCj4gQEAgLTE2Miw3 ICsxNjIsNyBAQCBlbnVtIG1hY19vdWkgewo+ICAgc3RhdGljIHZvaWQgX19pbml0IHVwZGF0ZV9m ZWNfbWFjX3Byb3AoZW51bSBtYWNfb3VpIG91aSkKPiAgIHsKPiAgIAlzdHJ1Y3QgZGV2aWNlX25v ZGUgKm5wLCAqZnJvbSA9IE5VTEw7Cj4gLQlzdHJ1Y3QgcHJvcGVydHkgKm9sZG1hYywgKm5ld21h YzsKPiArCXN0cnVjdCBwcm9wZXJ0eSAqbmV3bWFjOwo+ICAgCWNvbnN0IHUzMiAqb2NvdHAgPSBt eHNfZ2V0X29jb3RwKCk7Cj4gICAJdTggKm1hY2FkZHI7Cj4gICAJdTMyIHZhbDsKPiBAQCAtMjA4 LDExICsyMDgsNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgdXBkYXRlX2ZlY19tYWNfcHJvcChlbnVt IG1hY19vdWkgb3VpKQo+ICAgCQltYWNhZGRyWzRdID0gKHZhbCA+PiA4KSAmIDB4ZmY7Cj4gICAJ CW1hY2FkZHJbNV0gPSAodmFsID4+IDApICYgMHhmZjsKPgo+IC0JCW9sZG1hYyA9IG9mX2ZpbmRf cHJvcGVydHkobnAsIG5ld21hYy0+bmFtZSwgTlVMTCk7Cj4gLQkJaWYgKG9sZG1hYykKPiAtCQkJ cHJvbV91cGRhdGVfcHJvcGVydHkobnAsIG5ld21hYywgb2xkbWFjKTsKPiAtCQllbHNlCj4gLQkJ CXByb21fYWRkX3Byb3BlcnR5KG5wLCBuZXdtYWMpOwo+ICsJCXByb21fdXBkYXRlX3Byb3BlcnR5 KG5wLCBuZXdtYWMpOwo+ICAgCX0KPiAgIH0KPgo+CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51 eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5v cmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: lauri.hintsala@bluegiga.com (Lauri Hintsala) Date: Thu, 26 Jul 2012 08:32:32 +0300 Subject: [PATCH] ARM: mxs: fix compile error caused by prom_update_property change In-Reply-To: <1342160035-24170-1-git-send-email-shawn.guo@linaro.org> References: <1342160035-24170-1-git-send-email-shawn.guo@linaro.org> Message-ID: <5010D670.6070303@bluegiga.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > --- > 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); > } > } > >