* [PATCH] ARM: mxs: Adjust of_find_property()
@ 2012-07-23 7:28 Fabio Estevam
2012-07-25 7:52 ` Attila Kinali
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2012-07-23 7:28 UTC (permalink / raw)
To: linux-arm-kernel
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(-)
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);
}
}
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: mxs: Adjust of_find_property()
2012-07-23 7:28 [PATCH] ARM: mxs: Adjust of_find_property() Fabio Estevam
@ 2012-07-25 7:52 ` Attila Kinali
2012-07-25 10:33 ` Fabio Estevam
0 siblings, 1 reply; 3+ messages in thread
From: Attila Kinali @ 2012-07-25 7:52 UTC (permalink / raw)
To: linux-arm-kernel
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
--
The trouble with you, Shev, is you don't say anything until you've saved
up a whole truckload of damned heavy brick arguments and then you dump
them all out and never look at the bleeding body mangled beneath the heap
-- Tirin, The Dispossessed, U. Le Guin
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: mxs: Adjust of_find_property()
2012-07-25 7:52 ` Attila Kinali
@ 2012-07-25 10:33 ` Fabio Estevam
0 siblings, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2012-07-25 10:33 UTC (permalink / raw)
To: linux-arm-kernel
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?
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-25 10:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-23 7:28 [PATCH] ARM: mxs: Adjust of_find_property() Fabio Estevam
2012-07-25 7:52 ` Attila Kinali
2012-07-25 10:33 ` Fabio Estevam
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.