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/platforms/52xx | |
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/platforms/52xx')
-rw-r--r-- | arch/powerpc/platforms/52xx/efika.c | 15 | ||||
-rw-r--r-- | arch/powerpc/platforms/52xx/lite5200.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_common.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 |
4 files changed, 12 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c index 31a2a8ca1de7..042008486969 100644 --- a/arch/powerpc/platforms/52xx/efika.c +++ b/arch/powerpc/platforms/52xx/efika.c | |||
@@ -113,7 +113,7 @@ void __init efika_pcisetup(void) | |||
113 | return; | 113 | return; |
114 | } | 114 | } |
115 | 115 | ||
116 | bus_range = get_property(pcictrl, "bus-range", &len); | 116 | bus_range = of_get_property(pcictrl, "bus-range", &len); |
117 | if (bus_range == NULL || len < 2 * sizeof(int)) { | 117 | if (bus_range == NULL || len < 2 * sizeof(int)) { |
118 | printk(KERN_WARNING EFIKA_PLATFORM_NAME | 118 | printk(KERN_WARNING EFIKA_PLATFORM_NAME |
119 | ": Can't get bus-range for %s\n", pcictrl->full_name); | 119 | ": Can't get bus-range for %s\n", pcictrl->full_name); |
@@ -159,18 +159,17 @@ void __init efika_pcisetup(void) | |||
159 | static void efika_show_cpuinfo(struct seq_file *m) | 159 | static void efika_show_cpuinfo(struct seq_file *m) |
160 | { | 160 | { |
161 | struct device_node *root; | 161 | struct device_node *root; |
162 | const char *revision = NULL; | 162 | const char *revision; |
163 | const char *codegendescription = NULL; | 163 | const char *codegendescription; |
164 | const char *codegenvendor = NULL; | 164 | const char *codegenvendor; |
165 | 165 | ||
166 | root = of_find_node_by_path("/"); | 166 | root = of_find_node_by_path("/"); |
167 | if (!root) | 167 | if (!root) |
168 | return; | 168 | return; |
169 | 169 | ||
170 | revision = get_property(root, "revision", NULL); | 170 | revision = of_get_property(root, "revision", NULL); |
171 | codegendescription = | 171 | codegendescription = of_get_property(root, "CODEGEN,description", NULL); |
172 | get_property(root, "CODEGEN,description", NULL); | 172 | codegenvendor = of_get_property(root, "CODEGEN,vendor", NULL); |
173 | codegenvendor = get_property(root, "CODEGEN,vendor", NULL); | ||
174 | 173 | ||
175 | if (codegendescription) | 174 | if (codegendescription) |
176 | seq_printf(m, "machine\t\t: %s\n", codegendescription); | 175 | seq_printf(m, "machine\t\t: %s\n", codegendescription); |
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c index cc3b40de21dd..4f5ebaadcb50 100644 --- a/arch/powerpc/platforms/52xx/lite5200.c +++ b/arch/powerpc/platforms/52xx/lite5200.c | |||
@@ -94,8 +94,8 @@ static void __init lite5200_setup_arch(void) | |||
94 | 94 | ||
95 | np = of_find_node_by_type(NULL, "cpu"); | 95 | np = of_find_node_by_type(NULL, "cpu"); |
96 | if (np) { | 96 | if (np) { |
97 | unsigned int *fp = | 97 | const unsigned int *fp = |
98 | (int *)get_property(np, "clock-frequency", NULL); | 98 | of_get_property(np, "clock-frequency", NULL); |
99 | if (fp != 0) | 99 | if (fp != 0) |
100 | loops_per_jiffy = *fp / HZ; | 100 | loops_per_jiffy = *fp / HZ; |
101 | else | 101 | else |
@@ -132,7 +132,7 @@ void lite5200_show_cpuinfo(struct seq_file *m) | |||
132 | const char *model = NULL; | 132 | const char *model = NULL; |
133 | 133 | ||
134 | if (np) | 134 | if (np) |
135 | model = get_property(np, "model", NULL); | 135 | model = of_get_property(np, "model", NULL); |
136 | 136 | ||
137 | seq_printf(m, "vendor\t\t: Freescale Semiconductor\n"); | 137 | seq_printf(m, "vendor\t\t: Freescale Semiconductor\n"); |
138 | seq_printf(m, "machine\t\t: %s\n", model ? model : "unknown"); | 138 | seq_printf(m, "machine\t\t: %s\n", model ? model : "unknown"); |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c index ed0cb694aea8..2dd415ff55a9 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_common.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c | |||
@@ -60,7 +60,7 @@ mpc52xx_find_ipb_freq(struct device_node *node) | |||
60 | 60 | ||
61 | of_node_get(node); | 61 | of_node_get(node); |
62 | while (node) { | 62 | while (node) { |
63 | p_ipb_freq = get_property(node, "bus-frequency", NULL); | 63 | p_ipb_freq = of_get_property(node, "bus-frequency", NULL); |
64 | if (p_ipb_freq) | 64 | if (p_ipb_freq) |
65 | break; | 65 | break; |
66 | 66 | ||
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c index faf161bdbc1c..34d34a26d305 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c | |||
@@ -370,7 +370,7 @@ mpc52xx_add_bridge(struct device_node *node) | |||
370 | return -EINVAL; | 370 | return -EINVAL; |
371 | } | 371 | } |
372 | 372 | ||
373 | bus_range = get_property(node, "bus-range", &len); | 373 | bus_range = of_get_property(node, "bus-range", &len); |
374 | if (bus_range == NULL || len < 2 * sizeof(int)) { | 374 | if (bus_range == NULL || len < 2 * sizeof(int)) { |
375 | printk(KERN_WARNING "Can't get %s bus-range, assume bus 0\n", | 375 | printk(KERN_WARNING "Can't get %s bus-range, assume bus 0\n", |
376 | node->full_name); | 376 | node->full_name); |