[PATCH 3/4][POWERPC] Remove redundant of_get_cpu_node routine

[Nathan Fontenot <nfont@austin.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]

It appears that xics.c has its own of_get_cpu_node().  Remove this and use the 
common one from prom.c.

Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
---

[-- Attachment #2: of_get_cpu_node.patch --]
[-- Type: text/x-patch, Size: 1172 bytes --]

Index: linux-2.6/arch/powerpc/platforms/pseries/xics.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/pseries/xics.c	2008-02-06 11:31:44.000000000 -0600
+++ linux-2.6/arch/powerpc/platforms/pseries/xics.c	2008-02-06 11:34:34.000000000 -0600
@@ -658,31 +658,6 @@
 	set_irq_chained_handler(cascade, pseries_8259_cascade);
 }
 
-static struct device_node *cpuid_to_of_node(int cpu)
-{
-	struct device_node *np;
-	u32 hcpuid = get_hard_smp_processor_id(cpu);
-
-	for_each_node_by_type(np, "cpu") {
-		int i, len;
-		const u32 *intserv;
-
-		intserv = of_get_property(np, "ibm,ppc-interrupt-server#s",
-					&len);
-
-		if (!intserv)
-			intserv = of_get_property(np, "reg", &len);
-
-		i = len / sizeof(u32);
-
-		while (i--)
-			if (intserv[i] == hcpuid)
-				return np;
-	}
-
-	return NULL;
-}
-
 void __init xics_init_IRQ(void)
 {
 	int i, j;
@@ -711,7 +686,7 @@
 	xics_init_host();
 
 	/* Find the server numbers for the boot cpu. */
-	np = cpuid_to_of_node(boot_cpuid);
+	np = of_get_cpu_node(boot_cpuid, NULL);
 	BUG_ON(!np);
 	ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
 	if (!ireg)