From: Bjorn Helgaas <bhelgaas@google.com>
To: linux-pci@vger.kernel.org
Cc: linux-arch@vger.kernel.org, Tony Luck <tony.luck@intel.com>
Subject: [PATCH v3 11/34] ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented()
Date: Fri, 28 Oct 2011 16:26:26 -0600 [thread overview]
Message-ID: <20111028222626.30729.74531.stgit@bhelgaas.mtv.corp.google.com> (raw)
In-Reply-To: <20111028222432.30729.8431.stgit@bhelgaas.mtv.corp.google.com>
This doesn't change any functionality, but it makes a subsequent patch
slightly simpler.
CC: Tony Luck <tony.luck@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/ia64/pci/pci.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index aa2533a..a952fce 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -386,8 +386,11 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
* should handle the case here, but it appears that IA64 hasn't
* such quirk. So we just ignore the case now.
*/
- pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller);
+ pbus = pci_create_bus(NULL, bus, &pci_root_ops, controller);
+ if (!pbus)
+ return NULL;
+ pbus->subordinate = pci_scan_child_bus(pbus);
return pbus;
out3:
next prev parent reply other threads:[~2011-10-28 22:26 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-28 22:25 [PATCH v3 00/34] Create PCI root buses with correct resources Bjorn Helgaas
2011-10-28 22:25 ` [PATCH v3 01/34] PCI: add helpers for building PCI bus resource lists Bjorn Helgaas
2011-12-05 19:54 ` Jesse Barnes
2011-10-28 22:25 ` [PATCH v3 02/34] PCI: show host bridges and root bus resources Bjorn Helgaas
2011-10-28 22:25 ` Bjorn Helgaas
2011-10-28 22:25 ` [PATCH v3 03/34] PCI: add pci_create_root_bus() that accepts resource list Bjorn Helgaas
2011-10-28 22:25 ` [PATCH v3 04/34] PCI: add pci_scan_root_bus() " Bjorn Helgaas
2011-10-28 22:25 ` [PATCH v3 05/34] PCI: convert pci_scan_bus() to use pci_create_root_bus() Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 06/34] PCI: convert pci_scan_bus_parented() " Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 07/34] PCI: deprecate pci_scan_bus_parented() Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 08/34] alpha/PCI: convert to pci_scan_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas
2011-12-16 21:24 ` Bjorn Helgaas
2012-01-04 17:38 ` Jesse Barnes
2012-01-04 17:38 ` Jesse Barnes
2011-10-28 22:26 ` [PATCH v3 09/34] arm/PCI: " Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas
2011-12-23 1:10 ` Bjorn Helgaas
2012-01-04 17:28 ` Jesse Barnes
2012-01-04 17:28 ` Jesse Barnes
2011-10-28 22:26 ` [PATCH v3 10/34] frv/PCI: " Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas [this message]
2011-10-28 22:26 ` [PATCH v3 11/34] ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented() Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 12/34] ia64/PCI: convert to pci_create_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 13/34] microblaze/PCI: fix pci_bus_for_each_resource() usage Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 14/34] microblaze/PCI: make pcibios_setup_phb_resources() static Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 15/34] microblaze/PCI: convert to pci_create_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 16/34] microblaze/PCI: use pci_scan_root_bus() Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas
2011-10-28 22:26 ` [PATCH v3 17/34] mips/PCI: convert to pci_scan_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:26 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 18/34] mn10300/PCI: " Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 19/34] parisc/PCI: dino: use pci_create_bus() instead of pci_scan_bus_parented() Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 20/34] parisc/PCI: dino: convert to pci_create_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 21/34] parisc/PCI: lba: deal with LMMIO/PAT overlaps before creating PCI root bus Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 22/34] parisc/PCI: lba: use pci_create_bus() instead of pci_scan_bus_parented() Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 23/34] parisc/PCI: lba: convert to pci_create_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 24/34] powerpc/PCI: make pcibios_setup_phb_resources() static Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 25/34] powerpc/PCI: split PHB part out of pcibios_map_io_space() Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-12-06 18:07 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 26/34] powerpc/PCI: convert to pci_create_root_bus() Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-12-06 18:09 ` Bjorn Helgaas
2011-12-06 18:09 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 27/34] sh/PCI: convert to pci_scan_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 28/34] sparc/PCI: convert to pci_create_root_bus() Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-10-28 22:27 ` [PATCH v3 29/34] sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:27 ` Bjorn Helgaas
2011-10-28 22:28 ` [PATCH v3 30/34] x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan Bjorn Helgaas
2011-10-28 22:28 ` [PATCH v3 31/34] x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented() Bjorn Helgaas
2011-10-28 22:28 ` Bjorn Helgaas
2011-10-28 22:28 ` [PATCH v3 32/34] x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus() Bjorn Helgaas
2011-10-28 22:28 ` Bjorn Helgaas
2011-10-28 22:28 ` [PATCH v3 33/34] xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources Bjorn Helgaas
2011-10-28 22:28 ` [PATCH v3 34/34] PCI: remove pci_create_bus() Bjorn Helgaas
2011-10-29 16:25 ` [PATCH v3 00/34] Create PCI root buses with correct resources Bjorn Helgaas
2011-11-11 16:40 ` Bjorn Helgaas
2011-11-11 16:40 ` Bjorn Helgaas
2011-11-28 18:58 ` Bjorn Helgaas
2011-11-28 18:58 ` Bjorn Helgaas
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=20111028222626.30729.74531.stgit@bhelgaas.mtv.corp.google.com \
--to=bhelgaas@google.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=tony.luck@intel.com \
/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