From: Bjorn Helgaas <bhelgaas@google.com>
To: linux-pci@vger.kernel.org
Cc: linux-acpi@vger.kernel.org, x86@kernel.org,
linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 01/17] x86/PCI: Drop pcibios_scan_root() check for bus already scanned
Date: Wed, 29 Jan 2014 18:17:33 +0000 [thread overview]
Message-ID: <20140129181732.15476.79292.stgit@bhelgaas-glaptop.roam.corp.google.com> (raw)
In-Reply-To: <20140129174106.15476.7075.stgit@bhelgaas-glaptop.roam.corp.google.com>
The PCI core checks to see whether we've already scanned a bus, so we don't
need to do it in pcibios_scan_root(). Here's where it happens in the core:
pcibios_scan_root
pci_scan_bus_on_node
pci_scan_root_bus
pci_create_root_bus
b2 = pci_find_bus(pci_domain_nr(b), bus)
if (b2)
goto err_out; # already scanned this bus
This removes the check from pcibios_scan_root().
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/x86/pci/common.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 981c2dbd72cc..c47bb2288bb9 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -458,15 +458,6 @@ void __init dmi_check_pciprobe(void)
struct pci_bus *pcibios_scan_root(int busnum)
{
- struct pci_bus *bus = NULL;
-
- while ((bus = pci_find_next_bus(bus)) != NULL) {
- if (bus->number = busnum) {
- /* Already scanned */
- return bus;
- }
- }
-
return pci_scan_bus_on_node(busnum, &pci_root_ops,
get_mp_bus_to_node(busnum));
}
next prev parent reply other threads:[~2014-01-29 18:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 18:17 [PATCH 00/17] x86, ia64 NUMA cleanup Bjorn Helgaas
2014-01-29 18:17 ` Bjorn Helgaas [this message]
2014-01-29 18:17 ` [PATCH 02/17] x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_with_sysdata() Bjorn Helgaas
2014-01-29 18:17 ` [PATCH 03/17] x86/PCI: Use pcibios_scan_root() instead of pci_scan_bus_on_node() Bjorn Helgaas
2014-01-29 18:17 ` [PATCH 04/17] x86/PCI: Merge pci_scan_bus_on_node() into pcibios_scan_root() Bjorn Helgaas
2014-01-29 18:18 ` [PATCH 05/17] x86/PCI: Drop return value of pcibios_scan_root() Bjorn Helgaas
2014-01-29 18:18 ` [PATCH 06/17] x86/PCI: Add x86_pci_root_bus_node() to look up NUMA node from PCI bus Bjorn Helgaas
2014-01-29 18:18 ` [PATCH 07/17] x86/PCI: Use x86_pci_root_bus_node() instead of get_mp_bus_to_node() Bjorn Helgaas
2014-01-29 18:18 ` [PATCH 08/17] x86/PCI: Remove mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node() Bjorn Helgaas
2014-01-29 18:18 ` [PATCH 09/17] x86/PCI: Remove unnecessary list_empty(&pci_root_infos) check Bjorn Helgaas
2014-01-29 18:18 ` [PATCH 10/17] x86/PCI: Use NUMA_NO_NODE, not -1, for unknown node Bjorn Helgaas
2014-01-29 18:18 ` [PATCH 11/17] x86/PCI: Remove acpi_get_pxm() usage Bjorn Helgaas
2014-01-29 18:18 ` [PATCH 12/17] ia64 / sba_iommu: Use NUMA_NO_NODE, not MAX_NUMNODES, for unknown node Bjorn Helgaas
2014-01-29 18:19 ` [PATCH 13/17] ia64: Remove acpi_get_pxm() usage Bjorn Helgaas
2014-01-29 18:19 ` [PATCH 14/17] ACPI / numa: Fix acpi_get_node() prototype Bjorn Helgaas
2014-01-29 18:19 ` [PATCH 15/17] ACPI / numa: Simplify acpi_get_node() style Bjorn Helgaas
2014-01-29 18:19 ` [PATCH 16/17] ACPI / numa: Make __acpi_map_pxm_to_node(), acpi_get_pxm() static Bjorn Helgaas
2014-01-29 18:19 ` [PATCH 17/17] ACPI / numa: Use __weak, not the gcc-specific version Bjorn Helgaas
2014-01-29 21:23 ` [PATCH 00/17] x86, ia64 NUMA cleanup Rafael J. Wysocki
2014-02-03 19:23 ` Bjorn Helgaas
2014-02-04 18:32 ` Luck, Tony
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140129181732.15476.79292.stgit@bhelgaas-glaptop.roam.corp.google.com \
--to=bhelgaas@google.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox