linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Mohit Kumar <mohit.kumar@st.com>,
	Jingoo Han <jg1.han@samsung.com>
Subject: [PATCH Part1 v11 3/5] PCI: designware: Use pci_scan_root_bus() for simplicity
Date: Tue, 28 Apr 2015 15:01:37 +0800	[thread overview]
Message-ID: <1430204499-19571-4-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.
Designware added the busn resource to resources list
in dw_pcie_setup(). So it should be safe to use
pci_scan_root_bus() instead.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
CC: Mohit Kumar <mohit.kumar@st.com>
CC: Jingoo Han <jg1.han@samsung.com>
---
 drivers/pci/host/pcie-designware.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 2e9f84f..8c80f38 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -728,13 +728,11 @@ static struct pci_bus *dw_pcie_scan_bus(int nr, struct pci_sys_data *sys)
 	struct pcie_port *pp = sys_to_pcie(sys);
 
 	pp->root_bus_nr = sys->busnr;
-	bus = pci_create_root_bus(pp->dev, sys->busnr,
+	bus = pci_scan_root_bus(pp->dev, sys->busnr,
 				  &dw_pcie_ops, sys, &sys->resources);
 	if (!bus)
 		return NULL;
 
-	pci_scan_child_bus(bus);
-
 	if (bus && pp->ops->scan_bus)
 		pp->ops->scan_bus(pp);
 
-- 
1.7.1


  parent reply	other threads:[~2015-04-28  7:06 UTC|newest]

Thread overview: 19+ 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 ` [PATCH Part1 v11 1/5] PCI: mvebu: Use pci_common_init_dev() to simplify code Yijing Wang
2015-05-27  0:11   ` Bjorn Helgaas
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 [this message]
2015-04-28  8:15   ` [PATCH Part1 v11 3/5] PCI: designware: Use pci_scan_root_bus() for simplicity Lucas Stach
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-05-27 15:47   ` Bjorn Helgaas
2015-05-27 17:21     ` Tanmay Inamdar
2015-06-16 18:49       ` Bjorn Helgaas
2015-04-28  7:01 ` [PATCH Part1 v11 5/5] PCI: iproc: " Yijing Wang
2015-04-28 16:38   ` Ray Jui
2015-04-29  1:08     ` 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-27 16:45 ` Bjorn Helgaas
2015-05-27 14:18 [PATCH Part1 v11 3/5] PCI: designware: Use pci_scan_root_bus() for simplicity Jingoo Han
2015-06-03 11:45 ` Pratyush Anand

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-4-git-send-email-wangyijing@huawei.com \
    --to=wangyijing@huawei.com \
    --cc=arnd@arndb.de \
    --cc=bhelgaas@google.com \
    --cc=dja@axtens.net \
    --cc=jg1.han@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=mohit.kumar@st.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;
as well as URLs for NNTP newsgroup(s).