Bläddra i källkod

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>
David S. Miller 16 år sedan
förälder
incheckning
59966e3b4e
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      arch/sparc/kernel/prom_32.c
  2. 1 1
      arch/sparc/kernel/prom_64.c

+ 1 - 1
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;

+ 1 - 1
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;