diff options
Diffstat (limited to 'arch/powerpc/kernel/pci_of_scan.c')
-rw-r--r-- | arch/powerpc/kernel/pci_of_scan.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index 30378a19f65d..2a67e9baa59f 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c | |||
@@ -204,7 +204,7 @@ EXPORT_SYMBOL(of_create_pci_dev); | |||
204 | * this routine in turn call of_scan_bus() recusively to scan for more child | 204 | * this routine in turn call of_scan_bus() recusively to scan for more child |
205 | * devices. | 205 | * devices. |
206 | */ | 206 | */ |
207 | void __devinit of_scan_pci_bridge(struct pci_dev *dev) | 207 | void of_scan_pci_bridge(struct pci_dev *dev) |
208 | { | 208 | { |
209 | struct device_node *node = dev->dev.of_node; | 209 | struct device_node *node = dev->dev.of_node; |
210 | struct pci_bus *bus; | 210 | struct pci_bus *bus; |
@@ -299,8 +299,8 @@ EXPORT_SYMBOL(of_scan_pci_bridge); | |||
299 | * @bus: pci_bus structure for the PCI bus | 299 | * @bus: pci_bus structure for the PCI bus |
300 | * @rescan_existing: Flag indicating bus has already been set up | 300 | * @rescan_existing: Flag indicating bus has already been set up |
301 | */ | 301 | */ |
302 | static void __devinit __of_scan_bus(struct device_node *node, | 302 | static void __of_scan_bus(struct device_node *node, struct pci_bus *bus, |
303 | struct pci_bus *bus, int rescan_existing) | 303 | int rescan_existing) |
304 | { | 304 | { |
305 | struct device_node *child; | 305 | struct device_node *child; |
306 | const u32 *reg; | 306 | const u32 *reg; |
@@ -348,8 +348,7 @@ static void __devinit __of_scan_bus(struct device_node *node, | |||
348 | * @node: device tree node for the PCI bus | 348 | * @node: device tree node for the PCI bus |
349 | * @bus: pci_bus structure for the PCI bus | 349 | * @bus: pci_bus structure for the PCI bus |
350 | */ | 350 | */ |
351 | void __devinit of_scan_bus(struct device_node *node, | 351 | void of_scan_bus(struct device_node *node, struct pci_bus *bus) |
352 | struct pci_bus *bus) | ||
353 | { | 352 | { |
354 | __of_scan_bus(node, bus, 0); | 353 | __of_scan_bus(node, bus, 0); |
355 | } | 354 | } |
@@ -363,8 +362,7 @@ EXPORT_SYMBOL_GPL(of_scan_bus); | |||
363 | * Same as of_scan_bus, but for a pci_bus structure that has already been | 362 | * Same as of_scan_bus, but for a pci_bus structure that has already been |
364 | * setup. | 363 | * setup. |
365 | */ | 364 | */ |
366 | void __devinit of_rescan_bus(struct device_node *node, | 365 | void of_rescan_bus(struct device_node *node, struct pci_bus *bus) |
367 | struct pci_bus *bus) | ||
368 | { | 366 | { |
369 | __of_scan_bus(node, bus, 1); | 367 | __of_scan_bus(node, bus, 1); |
370 | } | 368 | } |