diff options
author | David S. Miller <davem@davemloft.net> | 2008-12-05 20:06:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-05 20:06:47 -0500 |
commit | 59966e3b4e9e6573b352301ad0ceed15196d4e2d (patch) | |
tree | 39f8da655c71208c1c03bc292b2980d7e1c70fd9 /arch | |
parent | b9e5567cda6387e0f4061bfceebbc1bd63ee42a6 (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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/kernel/prom_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/prom_64.c | 2 |
2 files changed, 2 insertions, 2 deletions
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) | |||
196 | return n; | 196 | return n; |
197 | } | 197 | } |
198 | 198 | ||
199 | static char * __init get_one_property(phandle node, char *name) | 199 | static char * __init get_one_property(phandle node, const char *name) |
200 | { | 200 | { |
201 | char *buf = "<NULL>"; | 201 | char *buf = "<NULL>"; |
202 | int len; | 202 | 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) | |||
407 | len = prom_getproplen(node, name); | 407 | len = prom_getproplen(node, name); |
408 | if (len > 0) { | 408 | if (len > 0) { |
409 | buf = prom_early_alloc(len); | 409 | buf = prom_early_alloc(len); |
410 | prom_getproperty(node, name, buf, len); | 410 | len = prom_getproperty(node, name, buf, len); |
411 | } | 411 | } |
412 | 412 | ||
413 | return buf; | 413 | return buf; |