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/celleb | |
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/celleb')
-rw-r--r-- | arch/powerpc/platforms/celleb/iommu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/pci.c | 18 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/setup.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c index e94de6a24622..755d869d8553 100644 --- a/arch/powerpc/platforms/celleb/iommu.c +++ b/arch/powerpc/platforms/celleb/iommu.c | |||
@@ -37,7 +37,7 @@ static int __init find_dma_window(u64 *io_space_id, u64 *ioid, | |||
37 | const unsigned long *dma_window; | 37 | const unsigned long *dma_window; |
38 | 38 | ||
39 | for_each_node_by_type(dn, "ioif") { | 39 | for_each_node_by_type(dn, "ioif") { |
40 | dma_window = get_property(dn, "toshiba,dma-window", NULL); | 40 | dma_window = of_get_property(dn, "toshiba,dma-window", NULL); |
41 | if (dma_window) { | 41 | if (dma_window) { |
42 | *io_space_id = (dma_window[0] >> 32) & 0xffffffffUL; | 42 | *io_space_id = (dma_window[0] >> 32) & 0xffffffffUL; |
43 | *ioid = dma_window[0] & 0x7ffUL; | 43 | *ioid = dma_window[0] & 0x7ffUL; |
diff --git a/arch/powerpc/platforms/celleb/pci.c b/arch/powerpc/platforms/celleb/pci.c index 98de836dfed3..d1adf34cd5e8 100644 --- a/arch/powerpc/platforms/celleb/pci.c +++ b/arch/powerpc/platforms/celleb/pci.c | |||
@@ -309,13 +309,13 @@ static int __devinit celleb_setup_fake_pci_device(struct device_node *node, | |||
309 | goto error; | 309 | goto error; |
310 | } | 310 | } |
311 | 311 | ||
312 | name = get_property(node, "model", &rlen); | 312 | name = of_get_property(node, "model", &rlen); |
313 | if (!name) { | 313 | if (!name) { |
314 | printk(KERN_ERR "PCI: model property not found.\n"); | 314 | printk(KERN_ERR "PCI: model property not found.\n"); |
315 | goto error; | 315 | goto error; |
316 | } | 316 | } |
317 | 317 | ||
318 | wi4 = get_property(node, "reg", &rlen); | 318 | wi4 = of_get_property(node, "reg", &rlen); |
319 | if (wi4 == NULL) | 319 | if (wi4 == NULL) |
320 | goto error; | 320 | goto error; |
321 | 321 | ||
@@ -352,10 +352,10 @@ static int __devinit celleb_setup_fake_pci_device(struct device_node *node, | |||
352 | } | 352 | } |
353 | pr_debug("PCI: res assigned 0x%016lx\n", (unsigned long)*res); | 353 | pr_debug("PCI: res assigned 0x%016lx\n", (unsigned long)*res); |
354 | 354 | ||
355 | wi0 = get_property(node, "device-id", NULL); | 355 | wi0 = of_get_property(node, "device-id", NULL); |
356 | wi1 = get_property(node, "vendor-id", NULL); | 356 | wi1 = of_get_property(node, "vendor-id", NULL); |
357 | wi2 = get_property(node, "class-code", NULL); | 357 | wi2 = of_get_property(node, "class-code", NULL); |
358 | wi3 = get_property(node, "revision-id", NULL); | 358 | wi3 = of_get_property(node, "revision-id", NULL); |
359 | 359 | ||
360 | celleb_config_write_fake(*config, PCI_DEVICE_ID, 2, wi0[0] & 0xffff); | 360 | celleb_config_write_fake(*config, PCI_DEVICE_ID, 2, wi0[0] & 0xffff); |
361 | celleb_config_write_fake(*config, PCI_VENDOR_ID, 2, wi1[0] & 0xffff); | 361 | celleb_config_write_fake(*config, PCI_VENDOR_ID, 2, wi1[0] & 0xffff); |
@@ -376,7 +376,7 @@ static int __devinit celleb_setup_fake_pci_device(struct device_node *node, | |||
376 | 376 | ||
377 | celleb_setup_pci_base_addrs(hose, devno, fn, num_base_addr); | 377 | celleb_setup_pci_base_addrs(hose, devno, fn, num_base_addr); |
378 | 378 | ||
379 | li = get_property(node, "interrupts", &rlen); | 379 | li = of_get_property(node, "interrupts", &rlen); |
380 | val = li[0]; | 380 | val = li[0]; |
381 | celleb_config_write_fake(*config, PCI_INTERRUPT_PIN, 1, 1); | 381 | celleb_config_write_fake(*config, PCI_INTERRUPT_PIN, 1, 1); |
382 | celleb_config_write_fake(*config, PCI_INTERRUPT_LINE, 1, val); | 382 | celleb_config_write_fake(*config, PCI_INTERRUPT_LINE, 1, val); |
@@ -424,7 +424,7 @@ static int __devinit phb_set_bus_ranges(struct device_node *dev, | |||
424 | const int *bus_range; | 424 | const int *bus_range; |
425 | unsigned int len; | 425 | unsigned int len; |
426 | 426 | ||
427 | bus_range = get_property(dev, "bus-range", &len); | 427 | bus_range = of_get_property(dev, "bus-range", &len); |
428 | if (bus_range == NULL || len < 2 * sizeof(int)) | 428 | if (bus_range == NULL || len < 2 * sizeof(int)) |
429 | return 1; | 429 | return 1; |
430 | 430 | ||
@@ -451,7 +451,7 @@ int __devinit celleb_setup_phb(struct pci_controller *phb) | |||
451 | struct device_node *node; | 451 | struct device_node *node; |
452 | unsigned int rlen; | 452 | unsigned int rlen; |
453 | 453 | ||
454 | name = get_property(dev, "name", &rlen); | 454 | name = of_get_property(dev, "name", &rlen); |
455 | if (!name) | 455 | if (!name) |
456 | return 1; | 456 | return 1; |
457 | 457 | ||
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c index 5f4d0d933238..ab1db9dd1aa1 100644 --- a/arch/powerpc/platforms/celleb/setup.c +++ b/arch/powerpc/platforms/celleb/setup.c | |||
@@ -67,7 +67,7 @@ static void celleb_show_cpuinfo(struct seq_file *m) | |||
67 | 67 | ||
68 | root = of_find_node_by_path("/"); | 68 | root = of_find_node_by_path("/"); |
69 | if (root) | 69 | if (root) |
70 | model = get_property(root, "model", NULL); | 70 | model = of_get_property(root, "model", NULL); |
71 | /* using "CHRP" is to trick anaconda into installing FCx into Celleb */ | 71 | /* using "CHRP" is to trick anaconda into installing FCx into Celleb */ |
72 | seq_printf(m, "machine\t\t: %s %s\n", celleb_machine_type, model); | 72 | seq_printf(m, "machine\t\t: %s %s\n", celleb_machine_type, model); |
73 | of_node_put(root); | 73 | of_node_put(root); |