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/82xx | |
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/82xx')
-rw-r--r-- | arch/powerpc/platforms/82xx/mpc82xx.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/82xx/mpc82xx_ads.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/platforms/82xx/mpc82xx.c b/arch/powerpc/platforms/82xx/mpc82xx.c index 74e7892cdfcf..cc9900d2e5ee 100644 --- a/arch/powerpc/platforms/82xx/mpc82xx.c +++ b/arch/powerpc/platforms/82xx/mpc82xx.c | |||
@@ -55,17 +55,17 @@ | |||
55 | static int __init get_freq(char *name, unsigned long *val) | 55 | static int __init get_freq(char *name, unsigned long *val) |
56 | { | 56 | { |
57 | struct device_node *cpu; | 57 | struct device_node *cpu; |
58 | unsigned int *fp; | 58 | const unsigned int *fp; |
59 | int found = 0; | 59 | int found = 0; |
60 | 60 | ||
61 | /* The cpu node should have timebase and clock frequency properties */ | 61 | /* The cpu node should have timebase and clock frequency properties */ |
62 | cpu = of_find_node_by_type(NULL, "cpu"); | 62 | cpu = of_find_node_by_type(NULL, "cpu"); |
63 | 63 | ||
64 | if (cpu) { | 64 | if (cpu) { |
65 | fp = (unsigned int *)get_property(cpu, name, NULL); | 65 | fp = of_get_property(cpu, name, NULL); |
66 | if (fp) { | 66 | if (fp) { |
67 | found = 1; | 67 | found = 1; |
68 | *val = *fp++; | 68 | *val = *fp; |
69 | } | 69 | } |
70 | 70 | ||
71 | of_node_put(cpu); | 71 | of_node_put(cpu); |
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c index 7334c1a15b90..47cb09f08052 100644 --- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c +++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c | |||
@@ -456,7 +456,7 @@ void m82xx_pci_init_irq(void) | |||
456 | iounmap(immap); | 456 | iounmap(immap); |
457 | return; | 457 | return; |
458 | } | 458 | } |
459 | irq_map = get_property(np, "interrupt-map", &size); | 459 | irq_map = of_get_property(np, "interrupt-map", &size); |
460 | if ((!irq_map) || (size <= 7)) { | 460 | if ((!irq_map) || (size <= 7)) { |
461 | printk(KERN_INFO "No interrupt-map property of pci node\n"); | 461 | printk(KERN_INFO "No interrupt-map property of pci node\n"); |
462 | iounmap(immap); | 462 | iounmap(immap); |
@@ -481,7 +481,7 @@ void m82xx_pci_init_irq(void) | |||
481 | } | 481 | } |
482 | pci_pic_node = of_node_get(np); | 482 | pci_pic_node = of_node_get(np); |
483 | /* PCI interrupt controller registers: status and mask */ | 483 | /* PCI interrupt controller registers: status and mask */ |
484 | regs = get_property(np, "reg", &size); | 484 | regs = of_get_property(np, "reg", &size); |
485 | if ((!regs) || (size <= 2)) { | 485 | if ((!regs) || (size <= 2)) { |
486 | printk(KERN_INFO "No reg property in pci pic node\n"); | 486 | printk(KERN_INFO "No reg property in pci pic node\n"); |
487 | iounmap(immap); | 487 | iounmap(immap); |
@@ -521,20 +521,20 @@ void __init add_bridge(struct device_node *np) | |||
521 | struct pci_controller *hose; | 521 | struct pci_controller *hose; |
522 | struct resource r; | 522 | struct resource r; |
523 | const int *bus_range; | 523 | const int *bus_range; |
524 | const void *ptr; | 524 | const uint *ptr; |
525 | 525 | ||
526 | memset(&r, 0, sizeof(r)); | 526 | memset(&r, 0, sizeof(r)); |
527 | if (of_address_to_resource(np, 0, &r)) { | 527 | if (of_address_to_resource(np, 0, &r)) { |
528 | printk(KERN_INFO "No PCI reg property in device tree\n"); | 528 | printk(KERN_INFO "No PCI reg property in device tree\n"); |
529 | return; | 529 | return; |
530 | } | 530 | } |
531 | if (!(ptr = get_property(np, "clock-frequency", NULL))) { | 531 | if (!(ptr = of_get_property(np, "clock-frequency", NULL))) { |
532 | printk(KERN_INFO "No clock-frequency property in PCI node"); | 532 | printk(KERN_INFO "No clock-frequency property in PCI node"); |
533 | return; | 533 | return; |
534 | } | 534 | } |
535 | pci_clk_frq = *(uint *) ptr; | 535 | pci_clk_frq = *ptr; |
536 | of_node_put(np); | 536 | of_node_put(np); |
537 | bus_range = get_property(np, "bus-range", &len); | 537 | bus_range = of_get_property(np, "bus-range", &len); |
538 | if (bus_range == NULL || len < 2 * sizeof(int)) { | 538 | if (bus_range == NULL || len < 2 * sizeof(int)) { |
539 | printk(KERN_WARNING "Can't get bus-range for %s, assume" | 539 | printk(KERN_WARNING "Can't get bus-range for %s, assume" |
540 | " bus 0\n", np->full_name); | 540 | " bus 0\n", np->full_name); |