diff options
Diffstat (limited to 'arch/powerpc/kernel/pci_of_scan.c')
-rw-r--r-- | arch/powerpc/kernel/pci_of_scan.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index 1e89a72fd030..fe0a5ad6f73e 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c | |||
@@ -202,9 +202,9 @@ EXPORT_SYMBOL(of_create_pci_dev); | |||
202 | * this routine in turn call of_scan_bus() recusively to scan for more child | 202 | * this routine in turn call of_scan_bus() recusively to scan for more child |
203 | * devices. | 203 | * devices. |
204 | */ | 204 | */ |
205 | void __devinit of_scan_pci_bridge(struct device_node *node, | 205 | void __devinit of_scan_pci_bridge(struct pci_dev *dev) |
206 | struct pci_dev *dev) | ||
207 | { | 206 | { |
207 | struct device_node *node = dev->dev.of_node; | ||
208 | struct pci_bus *bus; | 208 | struct pci_bus *bus; |
209 | const u32 *busrange, *ranges; | 209 | const u32 *busrange, *ranges; |
210 | int len, i, mode; | 210 | int len, i, mode; |
@@ -238,7 +238,6 @@ void __devinit of_scan_pci_bridge(struct device_node *node, | |||
238 | bus->primary = dev->bus->number; | 238 | bus->primary = dev->bus->number; |
239 | bus->subordinate = busrange[1]; | 239 | bus->subordinate = busrange[1]; |
240 | bus->bridge_ctl = 0; | 240 | bus->bridge_ctl = 0; |
241 | bus->dev.of_node = of_node_get(node); | ||
242 | 241 | ||
243 | /* parse ranges property */ | 242 | /* parse ranges property */ |
244 | /* PCI #address-cells == 3 and #size-cells == 2 always */ | 243 | /* PCI #address-cells == 3 and #size-cells == 2 always */ |
@@ -335,9 +334,7 @@ static void __devinit __of_scan_bus(struct device_node *node, | |||
335 | list_for_each_entry(dev, &bus->devices, bus_list) { | 334 | list_for_each_entry(dev, &bus->devices, bus_list) { |
336 | if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE || | 335 | if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE || |
337 | dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) { | 336 | dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) { |
338 | struct device_node *child = pci_device_to_OF_node(dev); | 337 | of_scan_pci_bridge(dev); |
339 | if (child) | ||
340 | of_scan_pci_bridge(child, dev); | ||
341 | } | 338 | } |
342 | } | 339 | } |
343 | } | 340 | } |