diff options
Diffstat (limited to 'arch/powerpc/kernel/rtas_pci.c')
| -rw-r--r-- | arch/powerpc/kernel/rtas_pci.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c index 5579f6559912..7442775ef2a1 100644 --- a/arch/powerpc/kernel/rtas_pci.c +++ b/arch/powerpc/kernel/rtas_pci.c | |||
| @@ -280,8 +280,7 @@ static int phb_set_bus_ranges(struct device_node *dev, | |||
| 280 | return 0; | 280 | return 0; |
| 281 | } | 281 | } |
| 282 | 282 | ||
| 283 | static int __devinit setup_phb(struct device_node *dev, | 283 | int __devinit setup_phb(struct device_node *dev, struct pci_controller *phb) |
| 284 | struct pci_controller *phb) | ||
| 285 | { | 284 | { |
| 286 | if (is_python(dev)) | 285 | if (is_python(dev)) |
| 287 | python_countermeasures(dev); | 286 | python_countermeasures(dev); |
| @@ -359,27 +358,6 @@ unsigned long __init find_and_init_phbs(void) | |||
| 359 | return 0; | 358 | return 0; |
| 360 | } | 359 | } |
| 361 | 360 | ||
| 362 | struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn) | ||
| 363 | { | ||
| 364 | struct pci_controller *phb; | ||
| 365 | int primary; | ||
| 366 | |||
| 367 | primary = list_empty(&hose_list); | ||
| 368 | phb = pcibios_alloc_controller(dn); | ||
| 369 | if (!phb) | ||
| 370 | return NULL; | ||
| 371 | setup_phb(dn, phb); | ||
| 372 | pci_process_bridge_OF_ranges(phb, dn, primary); | ||
| 373 | |||
| 374 | pci_setup_phb_io_dynamic(phb, primary); | ||
| 375 | |||
| 376 | pci_devs_phb_init_dynamic(phb); | ||
| 377 | scan_phb(phb); | ||
| 378 | |||
| 379 | return phb; | ||
| 380 | } | ||
| 381 | EXPORT_SYMBOL(init_phb_dynamic); | ||
| 382 | |||
| 383 | /* RPA-specific bits for removing PHBs */ | 361 | /* RPA-specific bits for removing PHBs */ |
| 384 | int pcibios_remove_root_bus(struct pci_controller *phb) | 362 | int pcibios_remove_root_bus(struct pci_controller *phb) |
| 385 | { | 363 | { |
