aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/pci_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
-rw-r--r--arch/powerpc/kernel/pci_32.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 7ad11e592f2b..132cd80afa21 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -266,9 +266,6 @@ pci_busdev_to_OF_node(struct pci_bus *bus, int devfn)
266{ 266{
267 struct device_node *parent, *np; 267 struct device_node *parent, *np;
268 268
269 if (!have_of)
270 return NULL;
271
272 pr_debug("pci_busdev_to_OF_node(%d,0x%x)\n", bus->number, devfn); 269 pr_debug("pci_busdev_to_OF_node(%d,0x%x)\n", bus->number, devfn);
273 parent = scan_OF_for_pci_bus(bus); 270 parent = scan_OF_for_pci_bus(bus);
274 if (parent == NULL) 271 if (parent == NULL)
@@ -309,8 +306,6 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn)
309 struct pci_controller* hose; 306 struct pci_controller* hose;
310 struct pci_dev* dev = NULL; 307 struct pci_dev* dev = NULL;
311 308
312 if (!have_of)
313 return -ENODEV;
314 /* Make sure it's really a PCI device */ 309 /* Make sure it's really a PCI device */
315 hose = pci_find_hose_for_OF_device(node); 310 hose = pci_find_hose_for_OF_device(node);
316 if (!hose || !hose->dn) 311 if (!hose || !hose->dn)
@@ -431,7 +426,7 @@ static int __init pcibios_init(void)
431 * numbers vs. kernel bus numbers since we may have to 426 * numbers vs. kernel bus numbers since we may have to
432 * remap them. 427 * remap them.
433 */ 428 */
434 if (pci_assign_all_buses && have_of) 429 if (pci_assign_all_buses)
435 pcibios_make_OF_bus_map(); 430 pcibios_make_OF_bus_map();
436 431
437 /* Call common code to handle resource allocation */ 432 /* Call common code to handle resource allocation */