From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Apr 2007 07:14:22 +0000 (+1000)
Subject: [POWERPC] Rename last get_property calls
X-Git-Tag: v2.6.22-rc1~1109^2~69
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3a6d2a54b8be331b36d849577a716867895ca75;p=linux-2.6

[POWERPC] Rename last get_property calls

These got added recently.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index e8aa1f3675..0c8ea7659d 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -132,7 +132,7 @@ static ssize_t of_device_get_modalias(struct of_device *ofdev,
 				ofdev->node->name, ofdev->node->type);
 
 	/* Get compatible property if any */
-	compat = get_property(ofdev->node, "compatible", &cplen);
+	compat = of_get_property(ofdev->node, "compatible", &cplen);
 	if (!compat)
 		return csize;
 
@@ -194,7 +194,7 @@ int of_device_uevent(struct device *dev,
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-	compat = get_property(ofdev->node, "compatible", &cplen);
+	compat = of_get_property(ofdev->node, "compatible", &cplen);
 	while (compat && *compat && cplen > 0) {
 		if (add_uevent_var(envp, num_envp, &i,
 				   buffer, buffer_size, &length,
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 0420084869..0eceb1fc26 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -232,12 +232,12 @@ static void __init efika_init_early(void)
 	/* find the boot console from /chosen/stdout */
 	if (!of_chosen)
 		return;
-	device_type = get_property(of_chosen, "linux,stdout-path", NULL);
+	device_type = of_get_property(of_chosen, "linux,stdout-path", NULL);
 	if (!device_type)
 		return;
 	stdout_node = of_find_node_by_path(device_type);
 	if (stdout_node) {
-		device_type = get_property(stdout_node, "device_type", NULL);
+		device_type = of_get_property(stdout_node, "device_type", NULL);
 		if (device_type && strcmp(device_type, "serial") == 0)
 			add_preferred_console("ttyPSC", 0, NULL);
 		of_node_put(stdout_node);