diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac/pci.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index 431a685a15dd..092cef4160a1 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c | |||
@@ -70,11 +70,11 @@ static int __init fixup_one_level_bus_range(struct device_node *node, int higher | |||
70 | int len; | 70 | int len; |
71 | 71 | ||
72 | /* For PCI<->PCI bridges or CardBus bridges, we go down */ | 72 | /* For PCI<->PCI bridges or CardBus bridges, we go down */ |
73 | class_code = get_property(node, "class-code", NULL); | 73 | class_code = of_get_property(node, "class-code", NULL); |
74 | if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && | 74 | if (!class_code || ((*class_code >> 8) != PCI_CLASS_BRIDGE_PCI && |
75 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) | 75 | (*class_code >> 8) != PCI_CLASS_BRIDGE_CARDBUS)) |
76 | continue; | 76 | continue; |
77 | bus_range = get_property(node, "bus-range", &len); | 77 | bus_range = of_get_property(node, "bus-range", &len); |
78 | if (bus_range != NULL && len > 2 * sizeof(int)) { | 78 | if (bus_range != NULL && len > 2 * sizeof(int)) { |
79 | if (bus_range[1] > higher) | 79 | if (bus_range[1] > higher) |
80 | higher = bus_range[1]; | 80 | higher = bus_range[1]; |
@@ -246,8 +246,8 @@ static int chaos_validate_dev(struct pci_bus *bus, int devfn, int offset) | |||
246 | if (np == NULL) | 246 | if (np == NULL) |
247 | return PCIBIOS_DEVICE_NOT_FOUND; | 247 | return PCIBIOS_DEVICE_NOT_FOUND; |
248 | 248 | ||
249 | vendor = get_property(np, "vendor-id", NULL); | 249 | vendor = of_get_property(np, "vendor-id", NULL); |
250 | device = get_property(np, "device-id", NULL); | 250 | device = of_get_property(np, "device-id", NULL); |
251 | if (vendor == NULL || device == NULL) | 251 | if (vendor == NULL || device == NULL) |
252 | return PCIBIOS_DEVICE_NOT_FOUND; | 252 | return PCIBIOS_DEVICE_NOT_FOUND; |
253 | 253 | ||
@@ -691,17 +691,17 @@ static void __init fixup_nec_usb2(void) | |||
691 | const u32 *prop; | 691 | const u32 *prop; |
692 | u8 bus, devfn; | 692 | u8 bus, devfn; |
693 | 693 | ||
694 | prop = get_property(nec, "vendor-id", NULL); | 694 | prop = of_get_property(nec, "vendor-id", NULL); |
695 | if (prop == NULL) | 695 | if (prop == NULL) |
696 | continue; | 696 | continue; |
697 | if (0x1033 != *prop) | 697 | if (0x1033 != *prop) |
698 | continue; | 698 | continue; |
699 | prop = get_property(nec, "device-id", NULL); | 699 | prop = of_get_property(nec, "device-id", NULL); |
700 | if (prop == NULL) | 700 | if (prop == NULL) |
701 | continue; | 701 | continue; |
702 | if (0x0035 != *prop) | 702 | if (0x0035 != *prop) |
703 | continue; | 703 | continue; |
704 | prop = get_property(nec, "reg", NULL); | 704 | prop = of_get_property(nec, "reg", NULL); |
705 | if (prop == NULL) | 705 | if (prop == NULL) |
706 | continue; | 706 | continue; |
707 | devfn = (prop[0] >> 8) & 0xff; | 707 | devfn = (prop[0] >> 8) & 0xff; |
@@ -909,7 +909,7 @@ static int __init add_bridge(struct device_node *dev) | |||
909 | has_address = (of_address_to_resource(dev, 0, &rsrc) == 0); | 909 | has_address = (of_address_to_resource(dev, 0, &rsrc) == 0); |
910 | 910 | ||
911 | /* Get bus range if any */ | 911 | /* Get bus range if any */ |
912 | bus_range = get_property(dev, "bus-range", &len); | 912 | bus_range = of_get_property(dev, "bus-range", &len); |
913 | if (bus_range == NULL || len < 2 * sizeof(int)) { | 913 | if (bus_range == NULL || len < 2 * sizeof(int)) { |
914 | printk(KERN_WARNING "Can't get bus-range for %s, assume" | 914 | printk(KERN_WARNING "Can't get bus-range for %s, assume" |
915 | " bus 0\n", dev->full_name); | 915 | " bus 0\n", dev->full_name); |