diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-03 08:26:41 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:19 -0400 |
commit | e2eb63927bfcb54232163bfec32440246fd44457 (patch) | |
tree | 596656edeb2332b5134d8236fa50b87f2c0ece29 /arch/powerpc/mm | |
parent | ceef87782a9452eeeca774e65d7f4e06455780a3 (diff) |
[POWERPC] Rename get_property to of_get_property: arch/powerpc
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/hash_native_64.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/numa.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c index 6f1016acdbf6..79aedaf36f2b 100644 --- a/arch/powerpc/mm/hash_native_64.c +++ b/arch/powerpc/mm/hash_native_64.c | |||
@@ -505,7 +505,7 @@ static inline int tlb_batching_enabled(void) | |||
505 | int enabled = 1; | 505 | int enabled = 1; |
506 | 506 | ||
507 | if (root) { | 507 | if (root) { |
508 | const char *model = get_property(root, "model", NULL); | 508 | const char *model = of_get_property(root, "model", NULL); |
509 | if (model && !strcmp(model, "IBM,9076-N81")) | 509 | if (model && !strcmp(model, "IBM,9076-N81")) |
510 | enabled = 0; | 510 | enabled = 0; |
511 | of_node_put(root); | 511 | of_node_put(root); |
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 683839b2b06b..b3a592b25ab3 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -74,7 +74,7 @@ static struct device_node * __cpuinit find_cpu_node(unsigned int cpu) | |||
74 | 74 | ||
75 | while ((cpu_node = of_find_node_by_type(cpu_node, "cpu")) != NULL) { | 75 | while ((cpu_node = of_find_node_by_type(cpu_node, "cpu")) != NULL) { |
76 | /* Try interrupt server first */ | 76 | /* Try interrupt server first */ |
77 | interrupt_server = get_property(cpu_node, | 77 | interrupt_server = of_get_property(cpu_node, |
78 | "ibm,ppc-interrupt-server#s", &len); | 78 | "ibm,ppc-interrupt-server#s", &len); |
79 | 79 | ||
80 | len = len / sizeof(u32); | 80 | len = len / sizeof(u32); |
@@ -85,7 +85,7 @@ static struct device_node * __cpuinit find_cpu_node(unsigned int cpu) | |||
85 | return cpu_node; | 85 | return cpu_node; |
86 | } | 86 | } |
87 | } else { | 87 | } else { |
88 | reg = get_property(cpu_node, "reg", &len); | 88 | reg = of_get_property(cpu_node, "reg", &len); |
89 | if (reg && (len > 0) && (reg[0] == hw_cpuid)) | 89 | if (reg && (len > 0) && (reg[0] == hw_cpuid)) |
90 | return cpu_node; | 90 | return cpu_node; |
91 | } | 91 | } |
@@ -97,7 +97,7 @@ static struct device_node * __cpuinit find_cpu_node(unsigned int cpu) | |||
97 | /* must hold reference to node during call */ | 97 | /* must hold reference to node during call */ |
98 | static const int *of_get_associativity(struct device_node *dev) | 98 | static const int *of_get_associativity(struct device_node *dev) |
99 | { | 99 | { |
100 | return get_property(dev, "ibm,associativity", NULL); | 100 | return of_get_property(dev, "ibm,associativity", NULL); |
101 | } | 101 | } |
102 | 102 | ||
103 | /* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa | 103 | /* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa |
@@ -179,7 +179,7 @@ static int __init find_min_common_depth(void) | |||
179 | * configuration (should be all 0's) and the second is for a normal | 179 | * configuration (should be all 0's) and the second is for a normal |
180 | * NUMA configuration. | 180 | * NUMA configuration. |
181 | */ | 181 | */ |
182 | ref_points = get_property(rtas_root, | 182 | ref_points = of_get_property(rtas_root, |
183 | "ibm,associativity-reference-points", &len); | 183 | "ibm,associativity-reference-points", &len); |
184 | 184 | ||
185 | if ((len >= 1) && ref_points) { | 185 | if ((len >= 1) && ref_points) { |
@@ -308,9 +308,9 @@ static void __init parse_drconf_memory(struct device_node *memory) | |||
308 | int nid, default_nid = 0; | 308 | int nid, default_nid = 0; |
309 | unsigned int start, ai, flags; | 309 | unsigned int start, ai, flags; |
310 | 310 | ||
311 | lm = get_property(memory, "ibm,lmb-size", &ls); | 311 | lm = of_get_property(memory, "ibm,lmb-size", &ls); |
312 | dm = get_property(memory, "ibm,dynamic-memory", &ld); | 312 | dm = of_get_property(memory, "ibm,dynamic-memory", &ld); |
313 | aa = get_property(memory, "ibm,associativity-lookup-arrays", &la); | 313 | aa = of_get_property(memory, "ibm,associativity-lookup-arrays", &la); |
314 | if (!lm || !dm || !aa || | 314 | if (!lm || !dm || !aa || |
315 | ls < sizeof(unsigned int) || ld < sizeof(unsigned int) || | 315 | ls < sizeof(unsigned int) || ld < sizeof(unsigned int) || |
316 | la < 2 * sizeof(unsigned int)) | 316 | la < 2 * sizeof(unsigned int)) |
@@ -404,10 +404,10 @@ static int __init parse_numa_properties(void) | |||
404 | const unsigned int *memcell_buf; | 404 | const unsigned int *memcell_buf; |
405 | unsigned int len; | 405 | unsigned int len; |
406 | 406 | ||
407 | memcell_buf = get_property(memory, | 407 | memcell_buf = of_get_property(memory, |
408 | "linux,usable-memory", &len); | 408 | "linux,usable-memory", &len); |
409 | if (!memcell_buf || len <= 0) | 409 | if (!memcell_buf || len <= 0) |
410 | memcell_buf = get_property(memory, "reg", &len); | 410 | memcell_buf = of_get_property(memory, "reg", &len); |
411 | if (!memcell_buf || len <= 0) | 411 | if (!memcell_buf || len <= 0) |
412 | continue; | 412 | continue; |
413 | 413 | ||
@@ -725,7 +725,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr) | |||
725 | const unsigned int *memcell_buf; | 725 | const unsigned int *memcell_buf; |
726 | unsigned int len; | 726 | unsigned int len; |
727 | 727 | ||
728 | memcell_buf = get_property(memory, "reg", &len); | 728 | memcell_buf = of_get_property(memory, "reg", &len); |
729 | if (!memcell_buf || len <= 0) | 729 | if (!memcell_buf || len <= 0) |
730 | continue; | 730 | continue; |
731 | 731 | ||