linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
	<linux-pci@vger.kernel.org>, Yinghai Lu <yinghai@kernel.org>,
	<linux-kernel@vger.kernel.org>,
	Marc Zyngier <marc.zyngier@arm.com>,
	<linux-arm-kernel@lists.infradead.org>,
	Russell King <linux@arm.linux.org.uk>, <dja@axtens.net>,
	<x86@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Rusty Russell <rusty@rustcorp.com.au>,
	Tony Luck <tony.luck@intel.com>, <linux-ia64@vger.kernel.org>,
	"David S. Miller" <davem@davemloft.net>,
	"Guan Xuetao" <gxt@mprc.pku.edu.cn>,
	<linux-alpha@vger.kernel.org>, <linux-m68k@vger.kernel.org>,
	Liviu Dudau <liviu@dudau.co.uk>, "Arnd Bergmann" <arnd@arndb.de>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	"Yijing Wang" <wangyijing@huawei.com>,
	Mohit Kumar <mohit.kumar@st.com>,
	Jingoo Han <jg1.han@samsung.com>
Subject: [PATCH v10 25/29] PCI/designware: Use pci_scan_root_bus() for simplicity
Date: Tue, 21 Apr 2015 19:34:44 +0800	[thread overview]
Message-ID: <1429616088-10249-26-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1429616088-10249-1-git-send-email-wangyijing@huawei.com>

Use pci_scan_root_bus() instead of pci_create_root_bus() +
pci_scan_child_bus() for simplicity.

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 8854d25..f8d3424 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, -1, &dw_pcie_ops, sys,
+	bus = pci_scan_root_bus(pp->dev, -1, 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-21 11:47 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-21 11:34 [PATCH v10 00/29] Refine PCI scan interfaces and make generic pci host bridge Yijing Wang
2015-04-21 11:34 ` [PATCH v10 01/29] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 02/29] PCI: Remove deprecated pci_scan_bus_parented() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 03/29] PCI: Save domain in pci_host_bridge Yijing Wang
2015-04-21 11:34 ` [PATCH v10 04/29] PCI: Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h Yijing Wang
2015-04-21 11:34 ` [PATCH v10 05/29] PCI: Remove argument bus for pci_create_root_bus() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 06/29] PCI: Alloc busn resource dynamically for pci_scan_bus() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 07/29] PCI: Allocate busn resource for pci_scan_root_bus() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 08/29] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang
2015-04-21 11:34 ` [PATCH v10 09/29] PCI: Separate pci_host_bridge creation out of pci_create_root_bus() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 10/29] PCI: Introduce pci_host_bridge_list to manage host bridges Yijing Wang
2015-04-21 11:34 ` [PATCH v10 11/29] PCI: Save sysdata in pci_host_bridge drvdata Yijing Wang
2015-04-21 11:34 ` [PATCH v10 12/29] powerpc/PCI: Rename pcibios_root_bridge_prepare() to pcibios_set_root_bus_speed() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 13/29] PCI: Move pcibios_root_bridge_prepare() to pci_create_host_bridge() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 14/29] PCI: Introduce pci_host_bridge_ops to support host specific operations Yijing Wang
2015-04-21 11:34 ` [PATCH v10 15/29] PCI: Introduce new scan function pci_scan_host_bridge() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 16/29] PCI: Introduce pci_bus_child_max_busnr() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 17/29] x86/PCI: Refine pci_acpi_scan_root() with generic pci_host_bridge Yijing Wang
2015-04-21 11:34 ` [PATCH v10 18/29] ia64/PCI: " Yijing Wang
2015-04-21 11:34 ` [PATCH v10 19/29] powerpc/pci: Use pci_scan_host_bridge() for simplicity Yijing Wang
2015-04-21 11:34 ` [PATCH v10 20/29] PCI: Remove pcibios_root_bridge_prepare() and pcibos_set_root_bus_speed() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 21/29] sparc/PCI: Use pci_scan_host_bridge() for simplicity Yijing Wang
2015-04-21 11:34 ` [PATCH v10 22/29] parisc/PCI: Use pci_scan_root_bus() " Yijing Wang
2015-04-21 11:34 ` [PATCH v10 23/29] PCI/mvebu: Use pci_common_init_dev() to simplify code Yijing Wang
2015-04-21 11:34 ` [PATCH v10 24/29] PCI/tegra: Remove redundant tegra_pcie_scan_bus() Yijing Wang
2015-04-21 11:34 ` Yijing Wang [this message]
2015-04-21 11:34 ` [PATCH v10 26/29] PCI/xgene: Use pci_scan_root_bus() instead of pci_create_root_bus() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 27/29] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 28/29] PCI: Remove platform specific pci_domain_nr() Yijing Wang
2015-04-21 11:34 ` [PATCH v10 29/29] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang
2015-04-27  4:09 ` [PATCH v10 00/29] Refine PCI scan interfaces and make generic pci host bridge Daniel Axtens
2015-04-27  6:25   ` Yijing Wang

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=1429616088-10249-26-git-send-email-wangyijing@huawei.com \
    --to=wangyijing@huawei.com \
    --cc=arnd@arndb.de \
    --cc=benh@kernel.crashing.org \
    --cc=bhelgaas@google.com \
    --cc=davem@davemloft.net \
    --cc=dja@axtens.net \
    --cc=geert@linux-m68k.org \
    --cc=gxt@mprc.pku.edu.cn \
    --cc=jg1.han@samsung.com \
    --cc=jiang.liu@linux.intel.com \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=liviu@dudau.co.uk \
    --cc=marc.zyngier@arm.com \
    --cc=mohit.kumar@st.com \
    --cc=rusty@rustcorp.com.au \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=x86@kernel.org \
    --cc=yinghai@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;
as well as URLs for NNTP newsgroup(s).