From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f54.google.com ([209.85.220.54]:36280 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423328Ab3FUQNT (ORCPT ); Fri, 21 Jun 2013 12:13:19 -0400 From: Jiang Liu To: Bjorn Helgaas , Konrad Rzeszutek Wilk , Jeremy Fitzhardinge Cc: liuj97@gmail.com, Jiang Liu , Yijing Wang , xen-devel@lists.xensource.com, virtualization@lists.linux-foundation.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Metcalf , Greg Kroah-Hartman , Thierry Reding Subject: [PATCH v2 3/3] PCI: mark pci_scan_bus_parented() as __deprecated Date: Sat, 22 Jun 2013 00:12:49 +0800 Message-Id: <1371831169-17291-5-git-send-email-liuj97@gmail.com> In-Reply-To: <1371831169-17291-1-git-send-email-liuj97@gmail.com> References: <1371831169-17291-1-git-send-email-liuj97@gmail.com> Sender: linux-pci-owner@vger.kernel.org List-ID: From: Jiang Liu Mark pci_scan_bus_parented() as __deprecated and clean up outdated comments. Signed-off-by: Jiang Liu Cc: Chris Metcalf Cc: Greg Kroah-Hartman Cc: Thierry Reding Cc: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org --- arch/tile/kernel/pci.c | 3 --- drivers/pci/probe.c | 19 ------------------- include/linux/pci.h | 2 -- 3 files changed, 24 deletions(-) diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 67237d3..936e087 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -309,9 +309,6 @@ int __init pcibios_init(void) * * It reads the PCI tree for this bus into the Linux * data structures. - * - * This is inlined in linux/pci.h and calls into - * pci_scan_bus_parented() in probe.c. */ pci_add_resource(&resources, &ioport_resource); pci_add_resource(&resources, &iomem_resource); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ed768d8..af30772 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1901,25 +1901,6 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, } EXPORT_SYMBOL(pci_scan_root_bus); -/* 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) { diff --git a/include/linux/pci.h b/include/linux/pci.h index f1229c7..41ec0a5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -720,8 +720,6 @@ void pcibios_bus_to_resource(struct pci_dev *dev, 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(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, -- 1.8.1.2