mirror of https://lore.kernel.org/lkml/
 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>, <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>,
	Yijing Wang <wangyijing0307@gmail.com>,
	"James E.J. Bottomley" <jejb@parisc-linux.org>,
	<linux-parisc@vger.kernel.org>
Subject: [PATCH v2 22/30] PCI/Parisc: Use pci_scan_root_bus() for simplicity
Date: Wed, 21 Jan 2015 08:30:17 +0800	[thread overview]
Message-ID: <1421800225-26230-23-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1421800225-26230-1-git-send-email-wangyijing@huawei.com>

From: Yijing Wang <wangyijing0307@gmail.com>

Now pci_bus_add_devices() has been ripped out
from pci_scan_root_bus(), we could use pci_scan_root_bus()
instead of pci_create_root_bus() + pci_scan_child_bus()
for simplicity. We could also remove the pci bus
resource(dino_current_bus,255) and pci_bus_update_busn_res_end(),
because pci_scan_root_bus() would do the same thing.

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
CC: "James E.J. Bottomley" <jejb@parisc-linux.org>
CC: linux-parisc@vger.kernel.org
---
 drivers/parisc/dino.c    |   11 ++---------
 drivers/parisc/lba_pci.c |    7 ++-----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index a0580af..e5ee339 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -977,15 +977,11 @@ static int __init dino_probe(struct parisc_device *dev)
 	if (dino_dev->hba.gmmio_space.flags)
 		pci_add_resource(&resources, &dino_dev->hba.gmmio_space);
 
-	dino_dev->hba.bus_num.start = dino_current_bus;
-	dino_dev->hba.bus_num.end = 255;
-	dino_dev->hba.bus_num.flags = IORESOURCE_BUS;
-	pci_add_resource(&resources, &dino_dev->hba.bus_num);
 	/*
 	** It's not used to avoid chicken/egg problems
 	** with configuration accessor functions.
 	*/
-	dino_dev->hba.hba_bus = bus = pci_create_root_bus(&dev->dev,
+	dino_dev->hba.hba_bus = bus = pci_scan_root_bus(&dev->dev,
 			 dino_current_bus, &dino_cfg_ops, NULL, &resources);
 	if (!bus) {
 		printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n",
@@ -996,13 +992,10 @@ static int __init dino_probe(struct parisc_device *dev)
 		return 0;
 	}
 
-	max = pci_scan_child_bus(bus);
-	pci_bus_update_busn_res_end(bus, max);
-
 	/* This code *depends* on scanning being single threaded
 	 * if it isn't, this global bus number count will fail
 	 */
-	dino_current_bus = max + 1;
+	dino_current_bus = bus->busn_res.end + 1;
 	pci_bus_assign_resources(bus);
 	pci_bus_add_devices(bus);
 	return 0;
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 37e71ff..254bf1a 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -1423,7 +1423,6 @@ lba_driver_probe(struct parisc_device *dev)
 	void *tmp_obj;
 	char *version;
 	void __iomem *addr = ioremap_nocache(dev->hpa.start, 4096);
-	int max;
 
 	/* Read HW Rev First */
 	func_class = READ_REG32(addr + LBA_FCLASS);
@@ -1564,15 +1563,13 @@ lba_driver_probe(struct parisc_device *dev)
 
 	dev->dev.platform_data = lba_dev;
 	lba_bus = lba_dev->hba.hba_bus =
-		pci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start,
+		pci_scan_root_bus(&dev->dev, lba_dev->hba.bus_num.start,
 				    cfg_ops, NULL, &resources);
 	if (!lba_bus) {
 		pci_free_resource_list(&resources);
 		return 0;
 	}
 
-	max = pci_scan_child_bus(lba_bus);
-
 	/* This is in lieu of calling pci_assign_unassigned_resources() */
 	if (is_pdc_pat()) {
 		/* assign resources to un-initialized devices */
@@ -1600,7 +1597,7 @@ lba_driver_probe(struct parisc_device *dev)
 		lba_dev->flags |= LBA_FLAG_SKIP_PROBE;
 	}
 
-	lba_next_bus = max + 1;
+	lba_next_bus = pci_bus_child_max_busnr(lba_bus) + 1;
 	pci_bus_add_devices(lba_bus);
 
 	/* Whew! Finally done! Tell services we got this one covered. */
-- 
1.7.1


  parent reply	other threads:[~2015-01-21  2:35 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-21  0:29 [PATCH v2 00/30] Refine PCI scan interfaces and make generic pci host bridge Yijing Wang
2015-01-21  0:29 ` [PATCH v2 01/30] PCI: Rip out pci_bus_add_devices() from pci_scan_bus() Yijing Wang
2015-01-21  0:29 ` [PATCH v2 02/30] PCI: Rip out pci_bus_add_devices() from pci_scan_root_bus() Yijing Wang
2015-01-21  0:29 ` [PATCH v2 03/30] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
2015-01-22 20:25   ` Konrad Rzeszutek Wilk
2015-01-23  2:12     ` Yijing Wang
2015-01-21  0:29 ` [PATCH v2 04/30] PCI: Remove deprecated pci_scan_bus_parented() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 05/30] PCI: Rename pci_scan_bus() to pci_scan_bus_legacy() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 06/30] PCI: Combine PCI domain and bus number in u32 arg Yijing Wang
2015-01-21  0:30 ` [PATCH v2 07/30] PCI: Pass PCI domain number combined with root bus number Yijing Wang
2015-01-21  0:30 ` [PATCH v2 08/30] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang
2015-01-21  0:30 ` [PATCH v2 09/30] PCI: Separate pci_host_bridge creation out of pci_create_root_bus() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 10/30] PCI: Introduce pci_host_bridge_list to manage host bridges Yijing Wang
2015-01-21  0:30 ` [PATCH v2 11/30] PCI: Save sysdata in pci_host_bridge drvdata Yijing Wang
2015-01-21  0:30 ` [PATCH v2 12/30] PCI: Introduce pci_host_bridge_ops to support host specific operations Yijing Wang
2015-01-21  0:30 ` [PATCH v2 13/30] PCI: Introduce new scan function pci_scan_root_bridge() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 14/30] PCI/x86: Refine pci_acpi_scan_root() with generic pci_host_bridge Yijing Wang
2015-01-21  0:30 ` [PATCH v2 15/30] PCI/IA64: " Yijing Wang
2015-01-21  0:30 ` [PATCH v2 16/30] PCI/IA64: Fix the build warning about pci_domain_nr() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 17/30] PCI/powerpc: Rename pcibios_root_bridge_prepare() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 18/30] PCI/powerpc: Use pci_scan_root_bridge() for simplicity Yijing Wang
2015-01-21  0:30 ` [PATCH v2 19/30] PCI: Remove weak pcibios_root_bridge_prepare() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 20/30] PCI/sparc: Use pci_scan_root_bridge() for simplicity Yijing Wang
2015-01-21  0:30 ` [PATCH v2 21/30] PCI: Introduce pci_bus_child_max_busnr() Yijing Wang
2015-01-21  0:30 ` Yijing Wang [this message]
2015-01-21  0:30 ` [PATCH v2 23/30] PCI/mvebu: Use pci_common_init_dev() to simplify code Yijing Wang
2015-01-22 17:40   ` Thomas Petazzoni
2015-01-23  2:11     ` Yijing Wang
2015-02-16 17:46     ` Lorenzo Pieralisi
2015-01-21  0:30 ` [PATCH v2 24/30] PCI/tegra: Remove redundant tegra_pcie_scan_bus() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 25/30] PCI/designware: Use pci_scan_root_bus() for simplicity Yijing Wang
2015-01-21  0:30 ` [PATCH v2 26/30] PCI/xgene: Use pci_scan_root_bus() instead of pci_create_root_bus() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 27/30] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 28/30] PCI: Export find_pci_host_bridge() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 29/30] PCI: Remove platform specific pci_domain_nr() Yijing Wang
2015-01-21  0:30 ` [PATCH v2 30/30] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang
2015-01-30  9:10 ` [PATCH v2 00/30] Refine PCI scan interfaces and make generic pci host bridge Yijing Wang
2015-01-30 15:45   ` Bjorn Helgaas
2015-01-31  0:55     ` Yijing Wang
2015-02-14 19:45 ` Lorenzo Pieralisi
2015-02-15  1:11   ` Yijing Wang
2015-02-16  1:18   ` Yijing Wang
2015-02-16  3:13     ` Benjamin Herrenschmidt
2015-02-16  3:28       ` Yijing Wang
2015-02-25 23:09 ` Bjorn Helgaas
2015-02-26  0:54   ` 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=1421800225-26230-23-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=geert@linux-m68k.org \
    --cc=gxt@mprc.pku.edu.cn \
    --cc=jejb@parisc-linux.org \
    --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-parisc@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=rusty@rustcorp.com.au \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=wangyijing0307@gmail.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

all inboxes | Powered by JetHome®