From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Yinghai Lu To: Jesse Barnes , x86 Cc: Bjorn Helgaas , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH -v3 42/47] PCI: Add __pci_scan_root_bus() that can skip bus_add Date: Sun, 18 Mar 2012 22:46:31 -0700 Message-Id: <1332135996-13860-43-git-send-email-yinghai@kernel.org> In-Reply-To: <1332135996-13860-1-git-send-email-yinghai@kernel.org> References: <1332135996-13860-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: So could insert pus pci_assign_unassigned_bus_resources() before do bus_add. Signed-off-by: Yinghai Lu --- drivers/pci/probe.c | 13 ++++++++++--- include/linux/pci.h | 3 +++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 14f2e69..d626c4e 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1938,8 +1938,9 @@ void pci_bus_release_busn_res(struct pci_bus *b) res, ret ? "can not be" : "is"); } -struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus, - struct pci_ops *ops, void *sysdata, struct list_head *resources) +struct pci_bus * __devinit __pci_scan_root_bus(struct device *parent, int bus, + struct pci_ops *ops, void *sysdata, struct list_head *resources, + bool bus_add) { struct pci_bus *b; struct pci_host_bridge_window *window, *n; @@ -1970,9 +1971,15 @@ struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus, if (!found) pci_bus_update_busn_res_end(b, b->subordinate); - pci_bus_add_devices(b); + if (bus_add) + pci_bus_add_devices(b); return b; } +struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus, + struct pci_ops *ops, void *sysdata, struct list_head *resources) +{ + return __pci_scan_root_bus(parent, bus, ops, sysdata, resources, true); +} EXPORT_SYMBOL(pci_scan_root_bus); /* Deprecated; use pci_scan_root_bus() instead */ diff --git a/include/linux/pci.h b/include/linux/pci.h index aec945d..161f6c0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -676,6 +676,9 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, void pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax); void pci_bus_update_busn_res_end(struct pci_bus *b, int busmax); void pci_bus_release_busn_res(struct pci_bus *b); +struct pci_bus * __devinit __pci_scan_root_bus(struct device *parent, int bus, + struct pci_ops *ops, void *sysdata, struct list_head *resources, + bool bus_add); struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources); -- 1.7.7