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/maple | |
| 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/maple')
| -rw-r--r-- | arch/powerpc/platforms/maple/pci.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c index ab5a6f12e1f0..b1d3b99c3f9d 100644 --- a/arch/powerpc/platforms/maple/pci.c +++ b/arch/powerpc/platforms/maple/pci.c | |||
| @@ -44,11 +44,11 @@ static int __init fixup_one_level_bus_range(struct device_node *node, int higher | |||
| 44 | int len; | 44 | int len; |
| 45 | 45 | ||
| 46 | /* For PCI<->PCI bridges or CardBus bridges, we go down */ | 46 | /* For PCI<->PCI bridges or CardBus bridges, we go down */ |
| 47 | class_code = get_property(node, "class-code", NULL); | 47 | class_code = of_get_property(node, "class-code", NULL); |
| 48 | if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && | 48 | if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && |
| 49 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) | 49 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) |
| 50 | continue; | 50 | continue; |
| 51 | bus_range = get_property(node, "bus-range", &len); | 51 | bus_range = of_get_property(node, "bus-range", &len); |
| 52 | if (bus_range != NULL && len > 2 * sizeof(int)) { | 52 | if (bus_range != NULL && len > 2 * sizeof(int)) { |
| 53 | if (bus_range[1] > higher) | 53 | if (bus_range[1] > higher) |
| 54 | higher = bus_range[1]; | 54 | higher = bus_range[1]; |
| @@ -454,7 +454,7 @@ static int __init add_bridge(struct device_node *dev) | |||
| 454 | 454 | ||
| 455 | DBG("Adding PCI host bridge %s\n", dev->full_name); | 455 | DBG("Adding PCI host bridge %s\n", dev->full_name); |
| 456 | 456 | ||
| 457 | bus_range = get_property(dev, "bus-range", &len); | 457 | bus_range = of_get_property(dev, "bus-range", &len); |
| 458 | if (bus_range == NULL || len < 2 * sizeof(int)) { | 458 | if (bus_range == NULL || len < 2 * sizeof(int)) { |
| 459 | printk(KERN_WARNING "Can't get bus-range for %s, assume bus 0\n", | 459 | printk(KERN_WARNING "Can't get bus-range for %s, assume bus 0\n", |
| 460 | dev->full_name); | 460 | dev->full_name); |
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index f21add0e4786..120cd048e0cc 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c | |||
| @@ -113,8 +113,8 @@ static void maple_restart(char *cmd) | |||
| 113 | printk(KERN_EMERG "Maple: Unable to find Service Processor\n"); | 113 | printk(KERN_EMERG "Maple: Unable to find Service Processor\n"); |
| 114 | goto fail; | 114 | goto fail; |
| 115 | } | 115 | } |
| 116 | maple_nvram_offset = get_property(sp, "restart-addr", NULL); | 116 | maple_nvram_offset = of_get_property(sp, "restart-addr", NULL); |
| 117 | maple_nvram_command = get_property(sp, "restart-value", NULL); | 117 | maple_nvram_command = of_get_property(sp, "restart-value", NULL); |
| 118 | of_node_put(sp); | 118 | of_node_put(sp); |
| 119 | 119 | ||
| 120 | /* send command */ | 120 | /* send command */ |
| @@ -140,8 +140,8 @@ static void maple_power_off(void) | |||
| 140 | printk(KERN_EMERG "Maple: Unable to find Service Processor\n"); | 140 | printk(KERN_EMERG "Maple: Unable to find Service Processor\n"); |
| 141 | goto fail; | 141 | goto fail; |
| 142 | } | 142 | } |
| 143 | maple_nvram_offset = get_property(sp, "power-off-addr", NULL); | 143 | maple_nvram_offset = of_get_property(sp, "power-off-addr", NULL); |
| 144 | maple_nvram_command = get_property(sp, "power-off-value", NULL); | 144 | maple_nvram_command = of_get_property(sp, "power-off-value", NULL); |
| 145 | of_node_put(sp); | 145 | of_node_put(sp); |
| 146 | 146 | ||
| 147 | /* send command */ | 147 | /* send command */ |
| @@ -249,7 +249,7 @@ static void __init maple_init_IRQ(void) | |||
| 249 | /* Find address list in /platform-open-pic */ | 249 | /* Find address list in /platform-open-pic */ |
| 250 | root = of_find_node_by_path("/"); | 250 | root = of_find_node_by_path("/"); |
| 251 | naddr = of_n_addr_cells(root); | 251 | naddr = of_n_addr_cells(root); |
| 252 | opprop = get_property(root, "platform-open-pic", &opplen); | 252 | opprop = of_get_property(root, "platform-open-pic", &opplen); |
| 253 | if (opprop != 0) { | 253 | if (opprop != 0) { |
| 254 | openpic_addr = of_read_number(opprop, naddr); | 254 | openpic_addr = of_read_number(opprop, naddr); |
| 255 | has_isus = (opplen > naddr); | 255 | has_isus = (opplen > naddr); |
| @@ -260,7 +260,7 @@ static void __init maple_init_IRQ(void) | |||
| 260 | BUG_ON(openpic_addr == 0); | 260 | BUG_ON(openpic_addr == 0); |
| 261 | 261 | ||
| 262 | /* Check for a big endian MPIC */ | 262 | /* Check for a big endian MPIC */ |
| 263 | if (get_property(np, "big-endian", NULL) != NULL) | 263 | if (of_get_property(np, "big-endian", NULL) != NULL) |
| 264 | flags |= MPIC_BIG_ENDIAN; | 264 | flags |= MPIC_BIG_ENDIAN; |
| 265 | 265 | ||
| 266 | /* XXX Maple specific bits */ | 266 | /* XXX Maple specific bits */ |
