aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-05 17:06:47 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-05 17:06:47 -0800
commit59966e3b4e9e6573b352301ad0ceed15196d4e2d (patch)
tree39f8da655c71208c1c03bc292b2980d7e1c70fd9
parentb9e5567cda6387e0f4061bfceebbc1bd63ee42a6 (diff)
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>
-rw-r--r--arch/sparc/kernel/prom_32.c2
-rw-r--r--arch/sparc/kernel/prom_64.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index a9859d2b256..a6809bc9ab9 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 e3969db4d58..ce96c1cf6c3 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;