PCI: Remove unused pci_find_upstream_pcie_bridge()

pci_find_upstream_pcie_bridge() is unused, so remove it.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 827ad831f1dd67335cf3918ed960f81579fc8405..a81f413083e49e5751013bf4f0602a2605286dc2 100644 (file)
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -103,40 +103,6 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
        return ret;
 }
 
-/*
- * find the upstream PCIe-to-PCI bridge of a PCI device
- * if the device is PCIE, return NULL
- * if the device isn't connected to a PCIe bridge (that is its parent is a
- * legacy PCI bridge and the bridge is directly connected to bus 0), return its
- * parent
- */
-struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev)
-{
-       struct pci_dev *tmp = NULL;
-
-       if (pci_is_pcie(pdev))
-               return NULL;
-       while (1) {
-               if (pci_is_root_bus(pdev->bus))
-                       break;
-               pdev = pdev->bus->self;
-               /* a p2p bridge */
-               if (!pci_is_pcie(pdev)) {
-                       tmp = pdev;
-                       continue;
-               }
-               /* PCI device should connect to a PCIe bridge */
-               if (pci_pcie_type(pdev) != PCI_EXP_TYPE_PCI_BRIDGE) {
-                       /* Busted hardware? */
-                       WARN_ON_ONCE(1);
-                       return NULL;
-               }
-               return pdev;
-       }
-
-       return tmp;
-}
-
 static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr)
 {
        struct pci_bus *child;

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 92c131efec1c3631d7af64e04008df13da6dbe33..bf5a47c0cb42b431b5e01ef737590fe0b9a36544 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1828,17 +1828,6 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
                           int (*fn)(struct pci_dev *pdev,
                                     u16 alias, void *data), void *data);
 
-/**
- * pci_find_upstream_pcie_bridge - find upstream PCIe-to-PCI bridge of a device
- * @pdev: the PCI device
- *
- * if the device is PCIE, return NULL
- * if the device isn't connected to a PCIe bridge (that is its parent is a
- * legacy PCI bridge and the bridge is directly connected to bus 0), return its
- * parent
- */
-struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev);
-
 /* helper functions for operation of device flag */
 static inline void pci_set_dev_assigned(struct pci_dev *pdev)
 {