powerpc: Stop using of_root

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / pseries / setup.c

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index ecea85c74c43fa9f697dadaa7857589cb25e191a..284a6fa04b0c27b8b0345986eff654a1ea4058db 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -1029,9 +1029,11 @@ static void __init pseries_add_hw_description(void)
                return;
        }
 
-       if (of_property_read_bool(of_root, "ibm,powervm-partition") ||
-           of_property_read_bool(of_root, "ibm,fw-net-version"))
+       dn = of_find_node_by_path("/");
+       if (of_property_read_bool(dn, "ibm,powervm-partition") ||
+           of_property_read_bool(dn, "ibm,fw-net-version"))
                seq_buf_printf(&ppc_hw_desc, "hv:phyp ");
+       of_node_put(dn);
 }
 
 /*
@@ -1091,7 +1093,11 @@ static void pseries_power_off(void)
 
 static int __init pSeries_probe(void)
 {
-       if (!of_node_is_type(of_root, "chrp"))
+       struct device_node *root = of_find_node_by_path("/");
+       bool ret = of_node_is_type(root, "chrp");
+
+       of_node_put(root);
+       if (!ret)
                return 0;
 
        /* Cell blades firmware claims to be chrp while it's not. Until this