From: David S. Miller <davem@davemloft.net>
Date: Sat, 6 Dec 2008 01:06:47 +0000 (-0800)
Subject: sparc: Commonize get_one_property() implementations.
X-Git-Tag: MMI-PSA29.97-13-9~30461^2~41
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=59966e3b4e9e6573b352301ad0ceed15196d4e2d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

sparc: Commonize get_one_property() implementations.

Add final len assignment in sparc64's get_one_property() (it's necessary
to avoid unchecked return value warnings on the sparc32 side),
and mark name argument const on sparc32's copy.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index a9859d2b2565..a6809bc9ab9d 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -196,7 +196,7 @@ static char * __init build_full_name(struct device_node *dp)
 	return n;
 }
 
-static char * __init get_one_property(phandle node, char *name)
+static char * __init get_one_property(phandle node, const char *name)
 {
 	char *buf = "<NULL>";
 	int len;
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c
index e3969db4d58b..ce96c1cf6c3a 100644
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@ -407,7 +407,7 @@ static char * __init get_one_property(phandle node, const char *name)
 	len = prom_getproplen(node, name);
 	if (len > 0) {
 		buf = prom_early_alloc(len);
-		prom_getproperty(node, name, buf, len);
+		len = prom_getproperty(node, name, buf, len);
 	}
 
 	return buf;