sparc32: Fix prom.c build warning
PATCH 1/1 sparc32: Fix prom.c build warning
Fix these 2.6.19-rc1 build warnings:
CC arch/sparc/kernel/prom.oarch/sparc/kernel/prom.c: In function `of_set_property':arch/sparc/kernel/prom.c:246: warning: passing arg 2 of prom_setprop' discards qualifiers from pointer target type arch/sparc/kernel/prom.c: In function build_one_prop':arch/sparc/kernel/prom.c:446: warning: unused variable `len'arch/sparc/kernel/prom.c:480: warning: ignoring return value of `prom_getproperty', declared with attribute warn_unused_result
Martin
Index: linux/arch/sparc/kernel/prom.c
=================================--- linux.orig/arch/sparc/kernel/prom.c 2006-10-06 00:33:30.000000000 +0100
+++ linux/arch/sparc/kernel/prom.c 2006-10-07 01:01:22.000000000 +0100
@@ -243,7 +243,7 @@
void *old_val = prop->value; int ret;
- ret = prom_setprop(dp->node, name, val, len);
+ ret = prom_setprop(dp->node, (char *) name, val, len);
err = -EINVAL;
if (ret >= 0) {
prop->value = new_val;
@@ -477,7 +477,9 @@
p->length = 0;
} else {
p->value = prom_early_alloc(p->length + 1);
- prom_getproperty(node, p->name, p->value, p->length);
+ len = prom_getproperty(node, p->name, p->value,
+ p->length);
+ if (len <= 0) p->length = 0;
((unsigned char *)p->value)[p->length] = '\0';
}
}
David Miller
AppliedFrom: Martin Habets <[email protected]>
Date: Mon, 9 Oct 2006 17:48:20 +0100
Quoted 9 lines
Fix these 2.6.19-rc1 build warnings:
CC
arch/sparc/kernel/prom.oarch/sparc/kernel/prom.c: In function `of_set_property':arch/sparc/kernel/prom.c:246: warning: passing arg 2 ofprom_setprop' discards qualifiers from pointer target type arch/sparc/kernel/prom.c: In functionbuild_one_prop':arch/sparc/kernel/prom.c:446: warning: unused variable `len'arch/sparc/kernel/prom.c:480: warning: ignoring return value of `prom_getproperty', declared with attributewarn_unused_result
Quoted 3 lines
Martin
Signed-off-by Martin Habets <[email protected]>
Applied, thanks Martin.