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/8xx | |
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/8xx')
-rw-r--r-- | arch/powerpc/platforms/8xx/m8xx_setup.c | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/8xx/mpc86xads_setup.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/8xx/mpc885ads_setup.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c index 9ed7125f0150..0901dbada350 100644 --- a/arch/powerpc/platforms/8xx/m8xx_setup.c +++ b/arch/powerpc/platforms/8xx/m8xx_setup.c | |||
@@ -85,17 +85,17 @@ init_internal_rtc(void) | |||
85 | static int __init get_freq(char *name, unsigned long *val) | 85 | static int __init get_freq(char *name, unsigned long *val) |
86 | { | 86 | { |
87 | struct device_node *cpu; | 87 | struct device_node *cpu; |
88 | unsigned int *fp; | 88 | const unsigned int *fp; |
89 | int found = 0; | 89 | int found = 0; |
90 | 90 | ||
91 | /* The cpu node should have timebase and clock frequency properties */ | 91 | /* The cpu node should have timebase and clock frequency properties */ |
92 | cpu = of_find_node_by_type(NULL, "cpu"); | 92 | cpu = of_find_node_by_type(NULL, "cpu"); |
93 | 93 | ||
94 | if (cpu) { | 94 | if (cpu) { |
95 | fp = (unsigned int *)get_property(cpu, name, NULL); | 95 | fp = of_get_property(cpu, name, NULL); |
96 | if (fp) { | 96 | if (fp) { |
97 | found = 1; | 97 | found = 1; |
98 | *val = *fp++; | 98 | *val = *fp; |
99 | } | 99 | } |
100 | 100 | ||
101 | of_node_put(cpu); | 101 | of_node_put(cpu); |
@@ -262,7 +262,7 @@ void mpc8xx_show_cpuinfo(struct seq_file *m) | |||
262 | 262 | ||
263 | root = of_find_node_by_path("/"); | 263 | root = of_find_node_by_path("/"); |
264 | if (root) | 264 | if (root) |
265 | model = get_property(root, "model", NULL); | 265 | model = of_get_property(root, "model", NULL); |
266 | seq_printf(m, "Machine\t\t: %s\n", model); | 266 | seq_printf(m, "Machine\t\t: %s\n", model); |
267 | of_node_put(root); | 267 | of_node_put(root); |
268 | 268 | ||
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c index ef52ce701b0e..a35315af5c53 100644 --- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c +++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c | |||
@@ -247,7 +247,7 @@ void init_smc_ioports(struct fs_uart_platform_info *data) | |||
247 | } | 247 | } |
248 | } | 248 | } |
249 | 249 | ||
250 | int platform_device_skip(char *model, int id) | 250 | int platform_device_skip(const char *model, int id) |
251 | { | 251 | { |
252 | return 0; | 252 | return 0; |
253 | } | 253 | } |
@@ -260,7 +260,7 @@ static void __init mpc86xads_setup_arch(void) | |||
260 | if (cpu != 0) { | 260 | if (cpu != 0) { |
261 | const unsigned int *fp; | 261 | const unsigned int *fp; |
262 | 262 | ||
263 | fp = get_property(cpu, "clock-frequency", NULL); | 263 | fp = of_get_property(cpu, "clock-frequency", NULL); |
264 | if (fp != 0) | 264 | if (fp != 0) |
265 | loops_per_jiffy = *fp / HZ; | 265 | loops_per_jiffy = *fp / HZ; |
266 | else | 266 | else |
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c index c5fefdf66c0a..a57b57785acd 100644 --- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c +++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c | |||
@@ -322,7 +322,7 @@ void init_smc_ioports(struct fs_uart_platform_info *data) | |||
322 | } | 322 | } |
323 | } | 323 | } |
324 | 324 | ||
325 | int platform_device_skip(char *model, int id) | 325 | int platform_device_skip(const char *model, int id) |
326 | { | 326 | { |
327 | #ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3 | 327 | #ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3 |
328 | const char *dev = "FEC"; | 328 | const char *dev = "FEC"; |
@@ -346,7 +346,7 @@ static void __init mpc885ads_setup_arch(void) | |||
346 | if (cpu != 0) { | 346 | if (cpu != 0) { |
347 | const unsigned int *fp; | 347 | const unsigned int *fp; |
348 | 348 | ||
349 | fp = get_property(cpu, "clock-frequency", NULL); | 349 | fp = of_get_property(cpu, "clock-frequency", NULL); |
350 | if (fp != 0) | 350 | if (fp != 0) |
351 | loops_per_jiffy = *fp / HZ; | 351 | loops_per_jiffy = *fp / HZ; |
352 | else | 352 | else |