aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/pci_64.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-04-03 08:26:41 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-12 13:55:19 -0400
commite2eb63927bfcb54232163bfec32440246fd44457 (patch)
tree596656edeb2332b5134d8236fa50b87f2c0ece29 /arch/powerpc/kernel/pci_64.c
parentceef87782a9452eeeca774e65d7f4e06455780a3 (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/kernel/pci_64.c')
-rw-r--r--arch/powerpc/kernel/pci_64.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 84b4f66e98b6..60d7d4baa227 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -268,7 +268,7 @@ static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
268 const u32 *prop; 268 const u32 *prop;
269 int len; 269 int len;
270 270
271 prop = get_property(np, name, &len); 271 prop = of_get_property(np, name, &len);
272 if (prop && len >= 4) 272 if (prop && len >= 4)
273 return *prop; 273 return *prop;
274 return def; 274 return def;
@@ -301,7 +301,7 @@ static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
301 u32 i; 301 u32 i;
302 int proplen; 302 int proplen;
303 303
304 addrs = get_property(node, "assigned-addresses", &proplen); 304 addrs = of_get_property(node, "assigned-addresses", &proplen);
305 if (!addrs) 305 if (!addrs)
306 return; 306 return;
307 DBG(" parse addresses (%d bytes) @ %p\n", proplen, addrs); 307 DBG(" parse addresses (%d bytes) @ %p\n", proplen, addrs);
@@ -343,7 +343,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
343 dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL); 343 dev = kzalloc(sizeof(struct pci_dev), GFP_KERNEL);
344 if (!dev) 344 if (!dev)
345 return NULL; 345 return NULL;
346 type = get_property(node, "device_type", NULL); 346 type = of_get_property(node, "device_type", NULL);
347 if (type == NULL) 347 if (type == NULL)
348 type = ""; 348 type = "";
349 349
@@ -407,7 +407,7 @@ void __devinit of_scan_bus(struct device_node *node,
407 407
408 while ((child = of_get_next_child(node, child)) != NULL) { 408 while ((child = of_get_next_child(node, child)) != NULL) {
409 DBG(" * %s\n", child->full_name); 409 DBG(" * %s\n", child->full_name);
410 reg = get_property(child, "reg", &reglen); 410 reg = of_get_property(child, "reg", &reglen);
411 if (reg == NULL || reglen < 20) 411 if (reg == NULL || reglen < 20)
412 continue; 412 continue;
413 devfn = (reg[0] >> 8) & 0xff; 413 devfn = (reg[0] >> 8) & 0xff;
@@ -440,13 +440,13 @@ void __devinit of_scan_pci_bridge(struct device_node *node,
440 DBG("of_scan_pci_bridge(%s)\n", node->full_name); 440 DBG("of_scan_pci_bridge(%s)\n", node->full_name);
441 441
442 /* parse bus-range property */ 442 /* parse bus-range property */
443 busrange = get_property(node, "bus-range", &len); 443 busrange = of_get_property(node, "bus-range", &len);
444 if (busrange == NULL || len != 8) { 444 if (busrange == NULL || len != 8) {
445 printk(KERN_DEBUG "Can't get bus-range for PCI-PCI bridge %s\n", 445 printk(KERN_DEBUG "Can't get bus-range for PCI-PCI bridge %s\n",
446 node->full_name); 446 node->full_name);
447 return; 447 return;
448 } 448 }
449 ranges = get_property(node, "ranges", &len); 449 ranges = of_get_property(node, "ranges", &len);
450 if (ranges == NULL) { 450 if (ranges == NULL) {
451 printk(KERN_DEBUG "Can't get ranges for PCI-PCI bridge %s\n", 451 printk(KERN_DEBUG "Can't get ranges for PCI-PCI bridge %s\n",
452 node->full_name); 452 node->full_name);
@@ -910,7 +910,7 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
910 unsigned int size; 910 unsigned int size;
911 int rlen = 0; 911 int rlen = 0;
912 912
913 range = get_property(isa_node, "ranges", &rlen); 913 range = of_get_property(isa_node, "ranges", &rlen);
914 if (range == NULL || (rlen < sizeof(struct isa_range))) { 914 if (range == NULL || (rlen < sizeof(struct isa_range))) {
915 printk(KERN_ERR "no ISA ranges or unexpected isa range size," 915 printk(KERN_ERR "no ISA ranges or unexpected isa range size,"
916 "mapping 64k\n"); 916 "mapping 64k\n");
@@ -970,7 +970,7 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
970 * (size depending on dev->n_addr_cells) 970 * (size depending on dev->n_addr_cells)
971 * cells 4+5 or 5+6: the size of the range 971 * cells 4+5 or 5+6: the size of the range
972 */ 972 */
973 ranges = get_property(dev, "ranges", &rlen); 973 ranges = of_get_property(dev, "ranges", &rlen);
974 if (ranges == NULL) 974 if (ranges == NULL)
975 return; 975 return;
976 hose->io_base_phys = 0; 976 hose->io_base_phys = 0;