[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-24
Subject:    ia64: Don't blindly probe PCI buses (probe only those reported by ACPI).
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2003-04-29 21:08:23
[Download RAW message or body]

ChangeSet 1.930.1.198, 2003/04/29 15:08:23-06:00, bjorn_helgaas@hp.com

	ia64: Don't blindly probe PCI buses (probe only those reported by ACPI).


# This patch includes the following deltas:
#	           ChangeSet	1.930.1.197 -> 1.930.1.198
#	arch/ia64/kernel/pci.c	1.16    -> 1.17   
#

 pci.c |   14 --------------
 1 files changed, 14 deletions(-)


diff -Nru a/arch/ia64/kernel/pci.c b/arch/ia64/kernel/pci.c
--- a/arch/ia64/kernel/pci.c	Wed Jul  2 15:53:28 2003
+++ b/arch/ia64/kernel/pci.c	Wed Jul  2 15:53:28 2003
@@ -40,8 +40,6 @@
 #define DBG(x...)
 #endif
 
-static unsigned int acpi_root_bridges;
-
 struct pci_fixup pcibios_fixups[1];
 
 struct pci_ops *pci_root_ops;
@@ -326,8 +324,6 @@
 	unsigned int windows = 0;
 	char *name;
 
-	acpi_root_bridges++;
-
 	controller = alloc_pci_controller(seg);
 	if (!controller)
 		goto out1;
@@ -376,7 +372,6 @@
 void __init
 pcibios_init (void)
 {
-#	define PCI_BUSES_TO_SCAN 256
 	int i = 0;
 	struct pci_controller *controller;
 
@@ -387,15 +382,6 @@
 	pcibios_config_init();
 
 	platform_pci_fixup(0);	/* phase 0 fixups (before buses scanned) */
-
-	/* Only probe blindly if ACPI didn't tell us about root bridges */
-	if (!acpi_root_bridges) {
-		printk("PCI: Probing PCI hardware\n");
-		controller = alloc_pci_controller(0);
-		if (controller)
-			for (i = 0; i < PCI_BUSES_TO_SCAN; i++)
-				pci_scan_bus(i, pci_root_ops, controller);
-	}
 
 	platform_pci_fixup(1);	/* phase 1 fixups (after buses scanned) */
 
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]