diff options
Diffstat (limited to 'arch/powerpc/platforms/maple/pci.c')
-rw-r--r-- | arch/powerpc/platforms/maple/pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c index 73c59904697f..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]; |
@@ -77,7 +77,7 @@ static void __init fixup_bus_range(struct device_node *bridge) | |||
77 | bridge->full_name); | 77 | bridge->full_name); |
78 | return; | 78 | return; |
79 | } | 79 | } |
80 | bus_range = (int *)prop->value; | 80 | bus_range = prop->value; |
81 | bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]); | 81 | bus_range[1] = fixup_one_level_bus_range(bridge->child, bus_range[1]); |
82 | } | 82 | } |
83 | 83 | ||
@@ -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); |