From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Wed, 19 Nov 2014 06:52:11 +0000 Subject: [PATCH 4/5] PCI: Remove pci_scan_bus() and pci_scan_bus_parented() Message-Id: <1416382369-13587-5-git-send-email-wangyijing@huawei.com> List-Id: References: <1416382369-13587-1-git-send-email-wangyijing@huawei.com> In-Reply-To: <1416382369-13587-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Russell King , x86@kernel.org, Thomas Gleixner , Tony Luck , linux-ia64@vger.kernel.org, Liviu Dudau , Arnd Bergmann , Geert Uytterhoeven , Yijing Wang Clean out pci_scan_bus() and pci_scan_bus_parented(). Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 38 -------------------------------------- include/linux/pci.h | 3 --- 2 files changed, 0 insertions(+), 41 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a8d90d4..79775b5 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2107,44 +2107,6 @@ struct pci_bus *pci_scan_bus_simple(struct device *parent, } EXPORT_SYMBOL(pci_scan_bus_simple); -/* Deprecated; use pci_scan_root_bus() instead */ -struct pci_bus *pci_scan_bus_parented(struct device *parent, - int bus, struct pci_ops *ops, void *sysdata) -{ - LIST_HEAD(resources); - struct pci_bus *b; - - pci_add_resource(&resources, &ioport_resource); - pci_add_resource(&resources, &iomem_resource); - pci_add_resource(&resources, &busn_resource); - b = pci_create_root_bus(parent, bus, ops, sysdata, &resources); - if (b) - pci_scan_child_bus(b); - else - pci_free_resource_list(&resources); - return b; -} -EXPORT_SYMBOL(pci_scan_bus_parented); - -struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, - void *sysdata) -{ - LIST_HEAD(resources); - struct pci_bus *b; - - pci_add_resource(&resources, &ioport_resource); - pci_add_resource(&resources, &iomem_resource); - pci_add_resource(&resources, &busn_resource); - b = pci_create_root_bus(NULL, bus, ops, sysdata, &resources); - if (b) { - pci_scan_child_bus(b); - } else { - pci_free_resource_list(&resources); - } - return b; -} -EXPORT_SYMBOL(pci_scan_bus); - /** * pci_rescan_bus_bridge_resize - scan a PCI bus for devices. * @bridge: PCI bridge for the bus to scan diff --git a/include/linux/pci.h b/include/linux/pci.h index befefbd..9ebc908 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -767,11 +767,8 @@ void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res, void pcibios_scan_specific_bus(int busn); struct pci_bus *pci_find_bus(int domain, int busnr); void pci_bus_add_devices(const struct pci_bus *bus); -struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, - struct pci_ops *ops, void *sysdata); struct pci_bus *pci_scan_bus_simple(struct device *parent, int bus, struct pci_ops *ops, void *sysdata); -struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata); struct pci_bus *pci_create_root_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources); -- 1.7.1