diff options
author | Yijing Wang <wangyijing@huawei.com> | 2015-04-28 05:32:34 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-12 16:26:28 -0400 |
commit | c0300089fd2dbeebef5ab9b6d66b4e6cedf8500a (patch) | |
tree | f3b6de8d392c53592d901fa10ba3a610728f1f99 | |
parent | 515d425bd2049e9f0f79131db58eb762fb95f2f6 (diff) |
PCI: Remove unused pci_scan_bus_parented()
No one uses pci_scan_bus_parented() any more, remove it.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r-- | drivers/pci/probe.c | 19 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 0 insertions, 21 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6675a7a1b9fc..7d6a61c0d5ad 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -2094,25 +2094,6 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, | |||
2094 | } | 2094 | } |
2095 | EXPORT_SYMBOL(pci_scan_root_bus); | 2095 | EXPORT_SYMBOL(pci_scan_root_bus); |
2096 | 2096 | ||
2097 | /* Deprecated; use pci_scan_root_bus() instead */ | ||
2098 | struct pci_bus *pci_scan_bus_parented(struct device *parent, | ||
2099 | int bus, struct pci_ops *ops, void *sysdata) | ||
2100 | { | ||
2101 | LIST_HEAD(resources); | ||
2102 | struct pci_bus *b; | ||
2103 | |||
2104 | pci_add_resource(&resources, &ioport_resource); | ||
2105 | pci_add_resource(&resources, &iomem_resource); | ||
2106 | pci_add_resource(&resources, &busn_resource); | ||
2107 | b = pci_create_root_bus(parent, bus, ops, sysdata, &resources); | ||
2108 | if (b) | ||
2109 | pci_scan_child_bus(b); | ||
2110 | else | ||
2111 | pci_free_resource_list(&resources); | ||
2112 | return b; | ||
2113 | } | ||
2114 | EXPORT_SYMBOL(pci_scan_bus_parented); | ||
2115 | |||
2116 | struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, | 2097 | struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, |
2117 | void *sysdata) | 2098 | void *sysdata) |
2118 | { | 2099 | { |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 353db8dc4c6e..1ec0d5d9723c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -773,8 +773,6 @@ void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res, | |||
773 | void pcibios_scan_specific_bus(int busn); | 773 | void pcibios_scan_specific_bus(int busn); |
774 | struct pci_bus *pci_find_bus(int domain, int busnr); | 774 | struct pci_bus *pci_find_bus(int domain, int busnr); |
775 | void pci_bus_add_devices(const struct pci_bus *bus); | 775 | void pci_bus_add_devices(const struct pci_bus *bus); |
776 | struct pci_bus *pci_scan_bus_parented(struct device *parent, int bus, | ||
777 | struct pci_ops *ops, void *sysdata); | ||
778 | struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata); | 776 | struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata); |
779 | struct pci_bus *pci_create_root_bus(struct device *parent, int bus, | 777 | struct pci_bus *pci_create_root_bus(struct device *parent, int bus, |
780 | struct pci_ops *ops, void *sysdata, | 778 | struct pci_ops *ops, void *sysdata, |