aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/pseries/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r--arch/powerpc/platforms/pseries/setup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 54e93eb8a8ee..e2fcd2307e67 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -93,7 +93,7 @@ static void pSeries_show_cpuinfo(struct seq_file *m)
93 93
94 root = of_find_node_by_path("/"); 94 root = of_find_node_by_path("/");
95 if (root) 95 if (root)
96 model = get_property(root, "model", NULL); 96 model = of_get_property(root, "model", NULL);
97 seq_printf(m, "machine\t\t: CHRP %s\n", model); 97 seq_printf(m, "machine\t\t: CHRP %s\n", model);
98 of_node_put(root); 98 of_node_put(root);
99} 99}
@@ -140,7 +140,7 @@ static void __init pseries_mpic_init_IRQ(void)
140 140
141 np = of_find_node_by_path("/"); 141 np = of_find_node_by_path("/");
142 naddr = of_n_addr_cells(np); 142 naddr = of_n_addr_cells(np);
143 opprop = get_property(np, "platform-open-pic", &opplen); 143 opprop = of_get_property(np, "platform-open-pic", &opplen);
144 if (opprop != 0) { 144 if (opprop != 0) {
145 openpic_addr = of_read_number(opprop, naddr); 145 openpic_addr = of_read_number(opprop, naddr);
146 printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); 146 printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
@@ -189,7 +189,7 @@ static void __init pseries_mpic_init_IRQ(void)
189 break; 189 break;
190 if (strcmp(np->name, "pci") != 0) 190 if (strcmp(np->name, "pci") != 0)
191 continue; 191 continue;
192 addrp = get_property(np, "8259-interrupt-acknowledge", 192 addrp = of_get_property(np, "8259-interrupt-acknowledge",
193 NULL); 193 NULL);
194 if (addrp == NULL) 194 if (addrp == NULL)
195 continue; 195 continue;
@@ -226,7 +226,7 @@ static void __init pseries_discover_pic(void)
226 226
227 for (np = NULL; (np = of_find_node_by_name(np, 227 for (np = NULL; (np = of_find_node_by_name(np,
228 "interrupt-controller"));) { 228 "interrupt-controller"));) {
229 typep = get_property(np, "compatible", NULL); 229 typep = of_get_property(np, "compatible", NULL);
230 if (strstr(typep, "open-pic")) { 230 if (strstr(typep, "open-pic")) {
231 pSeries_mpic_node = of_node_get(np); 231 pSeries_mpic_node = of_node_get(np);
232 ppc_md.init_IRQ = pseries_mpic_init_IRQ; 232 ppc_md.init_IRQ = pseries_mpic_init_IRQ;