From: Yijing Wang <wangyijing@huawei.com> To: Bjorn Helgaas <bhelgaas@google.com> Cc: <linux-pci@vger.kernel.org>, <dja@axtens.net>, Arnd Bergmann <arnd@arndb.de>, <linux-arm-kernel@lists.infradead.org>, Yijing Wang <wangyijing@huawei.com>, Ray Jui <rjui@broadcom.com> Subject: [PATCH Part1 v11 5/5] PCI: iproc: Use pci_scan_root_bus() instead of pci_create_root_bus() Date: Tue, 28 Apr 2015 15:01:39 +0800 [thread overview] Message-ID: <1430204499-19571-6-git-send-email-wangyijing@huawei.com> (raw) In-Reply-To: <1430204499-19571-1-git-send-email-wangyijing@huawei.com> Pci_bus_add_devices() was ripped out of pci_scan_root_bus(). Now pci_scan_root_bus() == pci_create_root_bus() + pci_scan_child_bus() if busn resource is supplied. iproc added the busn resource to resources list in of_pci_get_host_bridge_resources(). So it should be safe to use pci_scan_root_bus() instead. Signed-off-by: Yijing Wang <wangyijing@huawei.com> CC: Ray Jui <rjui@broadcom.com> --- drivers/pci/host/pcie-iproc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index 329e1b5..9622ebf 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -210,10 +210,10 @@ int iproc_pcie_setup(struct iproc_pcie *pcie) pcie->sysdata.private_data = pcie; - bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops, + bus = pci_scan_root_bus(pcie->dev, 0, &iproc_pcie_ops, &pcie->sysdata, pcie->resources); if (!bus) { - dev_err(pcie->dev, "unable to create PCI root bus\n"); + dev_err(pcie->dev, "unable to scan PCI root bus\n"); ret = -ENOMEM; goto err_power_off_phy; } @@ -227,7 +227,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie) iproc_pcie_enable(pcie); - pci_scan_child_bus(bus); pci_assign_unassigned_bus_resources(bus); pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); pci_bus_add_devices(bus); -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: wangyijing@huawei.com (Yijing Wang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH Part1 v11 5/5] PCI: iproc: Use pci_scan_root_bus() instead of pci_create_root_bus() Date: Tue, 28 Apr 2015 15:01:39 +0800 [thread overview] Message-ID: <1430204499-19571-6-git-send-email-wangyijing@huawei.com> (raw) In-Reply-To: <1430204499-19571-1-git-send-email-wangyijing@huawei.com> Pci_bus_add_devices() was ripped out of pci_scan_root_bus(). Now pci_scan_root_bus() == pci_create_root_bus() + pci_scan_child_bus() if busn resource is supplied. iproc added the busn resource to resources list in of_pci_get_host_bridge_resources(). So it should be safe to use pci_scan_root_bus() instead. Signed-off-by: Yijing Wang <wangyijing@huawei.com> CC: Ray Jui <rjui@broadcom.com> --- drivers/pci/host/pcie-iproc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index 329e1b5..9622ebf 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -210,10 +210,10 @@ int iproc_pcie_setup(struct iproc_pcie *pcie) pcie->sysdata.private_data = pcie; - bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops, + bus = pci_scan_root_bus(pcie->dev, 0, &iproc_pcie_ops, &pcie->sysdata, pcie->resources); if (!bus) { - dev_err(pcie->dev, "unable to create PCI root bus\n"); + dev_err(pcie->dev, "unable to scan PCI root bus\n"); ret = -ENOMEM; goto err_power_off_phy; } @@ -227,7 +227,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie) iproc_pcie_enable(pcie); - pci_scan_child_bus(bus); pci_assign_unassigned_bus_resources(bus); pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); pci_bus_add_devices(bus); -- 1.7.1
next prev parent reply other threads:[~2015-04-28 7:08 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-28 7:01 [PATCH Part1 v11 0/5] Some cleanup for pcie host drivers Yijing Wang 2015-04-28 7:01 ` Yijing Wang 2015-04-28 7:01 ` [PATCH Part1 v11 1/5] PCI: mvebu: Use pci_common_init_dev() to simplify code Yijing Wang 2015-04-28 7:01 ` Yijing Wang 2015-05-27 0:11 ` Bjorn Helgaas 2015-05-27 0:11 ` Bjorn Helgaas [not found] ` <1430204499-19571-1-git-send-email-wangyijing-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> 2015-04-28 7:01 ` [PATCH Part1 v11 2/5] PCI: tegra: Remove redundant tegra_pcie_scan_bus() Yijing Wang 2015-04-28 7:01 ` Yijing Wang 2015-04-28 7:01 ` Yijing Wang 2015-04-28 7:01 ` [PATCH Part1 v11 3/5] PCI: designware: Use pci_scan_root_bus() for simplicity Yijing Wang 2015-04-28 7:01 ` Yijing Wang 2015-04-28 8:15 ` Lucas Stach 2015-04-28 8:15 ` Lucas Stach 2015-05-27 0:12 ` Bjorn Helgaas 2015-05-27 0:12 ` Bjorn Helgaas 2015-04-28 7:01 ` [PATCH Part1 v11 4/5] PCI: xgene: Use pci_scan_root_bus() instead of pci_create_root_bus() Yijing Wang 2015-04-28 7:01 ` Yijing Wang 2015-05-27 15:47 ` Bjorn Helgaas 2015-05-27 15:47 ` Bjorn Helgaas 2015-05-27 17:21 ` Tanmay Inamdar 2015-05-27 17:21 ` Tanmay Inamdar 2015-06-16 18:49 ` Bjorn Helgaas 2015-06-16 18:49 ` Bjorn Helgaas 2015-04-28 7:01 ` Yijing Wang [this message] 2015-04-28 7:01 ` [PATCH Part1 v11 5/5] PCI: iproc: " Yijing Wang 2015-04-28 16:38 ` Ray Jui 2015-04-28 16:38 ` Ray Jui 2015-04-29 1:08 ` Yijing Wang 2015-04-29 1:08 ` Yijing Wang 2015-04-29 1:12 ` Yijing Wang 2015-04-29 1:12 ` Yijing Wang 2015-05-14 8:32 ` [PATCH Part1 v11 0/5] Some cleanup for pcie host drivers Yijing Wang 2015-05-14 8:32 ` Yijing Wang 2015-05-27 16:45 ` Bjorn Helgaas 2015-05-27 16:45 ` 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=1430204499-19571-6-git-send-email-wangyijing@huawei.com \ --to=wangyijing@huawei.com \ --cc=arnd@arndb.de \ --cc=bhelgaas@google.com \ --cc=dja@axtens.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=rjui@broadcom.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.