Patchwork ARM: mxs: Adjust of_find_property()

login
register
mail settings
Submitter Fabio Estevam
Date July 23, 2012, 7:28 a.m.
Message ID <1343028538-13891-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/172560/
State New
Headers show

Comments

Fabio Estevam - July 23, 2012, 7:28 a.m.
From: Fabio Estevam <fabio.estevam@freescale.com>

Since commit 475d00 (of: Improve prom_update_property() function) prom_update_property requires
two arguments.

Fix this in order to get rid of the following build error:

arch/arm/mach-mxs/mach-mxs.c:175:4: error: too many arguments to function 'prom_update_property'

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/mach-mxs/mach-mxs.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
Attila Kinali - July 25, 2012, 7:52 a.m.
On Mon, 23 Jul 2012 04:28:58 -0300
Fabio Estevam <festevam@gmail.com> wrote:

> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Since commit 475d00 (of: Improve prom_update_property() function) prom_update_property requires
> two arguments.
> 
> Fix this in order to get rid of the following build error:
> 
> arch/arm/mach-mxs/mach-mxs.c:175:4: error: too many arguments to function 'prom_update_property'

The same fix has been already send by Shawn Guo[1] and Lauri Hintsala[2]

			Attila Kinali

[1] http://article.gmane.org/gmane.linux.kernel.next/23330
[2] http://article.gmane.org/gmane.linux.ports.arm.kernel/177465
Fabio Estevam - July 25, 2012, 10:33 a.m.
On Wed, Jul 25, 2012 at 4:52 AM, Attila Kinali <attila@kinali.ch> wrote:
> On Mon, 23 Jul 2012 04:28:58 -0300
> Fabio Estevam <festevam@gmail.com> wrote:
>
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> Since commit 475d00 (of: Improve prom_update_property() function) prom_update_property requires
>> two arguments.
>>
>> Fix this in order to get rid of the following build error:
>>
>> arch/arm/mach-mxs/mach-mxs.c:175:4: error: too many arguments to function 'prom_update_property'
>
> The same fix has been already send by Shawn Guo[1] and Lauri Hintsala[2]

Couldn't one of this  patch be applied then?

Patch

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 648bdd0..b70011d 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_add_property(np, newmac);
 	}
 }