diff options
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index e99ffe2140bf..ae04f9418363 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -637,7 +637,7 @@ make_one_node_map(struct device_node* node, u8 pci_bus) | |||
637 | 637 | ||
638 | if (pci_bus >= pci_bus_count) | 638 | if (pci_bus >= pci_bus_count) |
639 | return; | 639 | return; |
640 | bus_range = get_property(node, "bus-range", &len); | 640 | bus_range = of_get_property(node, "bus-range", &len); |
641 | if (bus_range == NULL || len < 2 * sizeof(int)) { | 641 | if (bus_range == NULL || len < 2 * sizeof(int)) { |
642 | printk(KERN_WARNING "Can't get bus-range for %s, " | 642 | printk(KERN_WARNING "Can't get bus-range for %s, " |
643 | "assuming it starts at 0\n", node->full_name); | 643 | "assuming it starts at 0\n", node->full_name); |
@@ -649,11 +649,11 @@ make_one_node_map(struct device_node* node, u8 pci_bus) | |||
649 | struct pci_dev* dev; | 649 | struct pci_dev* dev; |
650 | const unsigned int *class_code, *reg; | 650 | const unsigned int *class_code, *reg; |
651 | 651 | ||
652 | class_code = get_property(node, "class-code", NULL); | 652 | class_code = of_get_property(node, "class-code", NULL); |
653 | if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && | 653 | if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && |
654 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) | 654 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) |
655 | continue; | 655 | continue; |
656 | reg = get_property(node, "reg", NULL); | 656 | reg = of_get_property(node, "reg", NULL); |
657 | if (!reg) | 657 | if (!reg) |
658 | continue; | 658 | continue; |
659 | dev = pci_find_slot(pci_bus, ((reg[0] >> 8) & 0xff)); | 659 | dev = pci_find_slot(pci_bus, ((reg[0] >> 8) & 0xff)); |
@@ -724,7 +724,7 @@ scan_OF_pci_childs(struct device_node* node, pci_OF_scan_iterator filter, void* | |||
724 | * a fake root for all functions of a multi-function device, | 724 | * a fake root for all functions of a multi-function device, |
725 | * we go down them as well. | 725 | * we go down them as well. |
726 | */ | 726 | */ |
727 | class_code = get_property(node, "class-code", NULL); | 727 | class_code = of_get_property(node, "class-code", NULL); |
728 | if ((!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && | 728 | if ((!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && |
729 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) && | 729 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) && |
730 | strcmp(node->name, "multifunc-device")) | 730 | strcmp(node->name, "multifunc-device")) |
@@ -744,7 +744,7 @@ static struct device_node *scan_OF_for_pci_dev(struct device_node *parent, | |||
744 | unsigned int psize; | 744 | unsigned int psize; |
745 | 745 | ||
746 | while ((np = of_get_next_child(parent, np)) != NULL) { | 746 | while ((np = of_get_next_child(parent, np)) != NULL) { |
747 | reg = get_property(np, "reg", &psize); | 747 | reg = of_get_property(np, "reg", &psize); |
748 | if (reg == NULL || psize < 4) | 748 | if (reg == NULL || psize < 4) |
749 | continue; | 749 | continue; |
750 | if (((reg[0] >> 8) & 0xff) == devfn) | 750 | if (((reg[0] >> 8) & 0xff) == devfn) |
@@ -859,7 +859,7 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn) | |||
859 | if (!scan_OF_pci_childs(((struct device_node*)hose->arch_data)->child, | 859 | if (!scan_OF_pci_childs(((struct device_node*)hose->arch_data)->child, |
860 | find_OF_pci_device_filter, (void *)node)) | 860 | find_OF_pci_device_filter, (void *)node)) |
861 | return -ENODEV; | 861 | return -ENODEV; |
862 | reg = get_property(node, "reg", NULL); | 862 | reg = of_get_property(node, "reg", NULL); |
863 | if (!reg) | 863 | if (!reg) |
864 | return -ENODEV; | 864 | return -ENODEV; |
865 | *bus = (reg[0] >> 16) & 0xff; | 865 | *bus = (reg[0] >> 16) & 0xff; |
@@ -902,7 +902,7 @@ pci_process_bridge_OF_ranges(struct pci_controller *hose, | |||
902 | * that can have more than 3 ranges, fortunately using contiguous | 902 | * that can have more than 3 ranges, fortunately using contiguous |
903 | * addresses -- BenH | 903 | * addresses -- BenH |
904 | */ | 904 | */ |
905 | dt_ranges = get_property(dev, "ranges", &rlen); | 905 | dt_ranges = of_get_property(dev, "ranges", &rlen); |
906 | if (!dt_ranges) | 906 | if (!dt_ranges) |
907 | return; | 907 | return; |
908 | /* Sanity check, though hopefully that never happens */ | 908 | /* Sanity check, though hopefully that never happens */ |