summaryrefslogtreecommitdiffstats
path: root/drivers/pci/host-bridge.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-04-02 18:31:53 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-04-30 13:53:42 -0600
commit7b54366358008241f88228f02cc80ab352265eac (patch)
tree4de6ae8ce83afabf1b4405cba6895b09d1bc790d /drivers/pci/host-bridge.c
parent459f58ce51e2e11235b7bb4b1732ebf3c17d86f7 (diff)
downloadblackbird-op-linux-7b54366358008241f88228f02cc80ab352265eac.tar.gz
blackbird-op-linux-7b54366358008241f88228f02cc80ab352265eac.zip
PCI: add generic device into pci_host_bridge struct
Use that device for pci_root_bus bridge pointer. Use pci_release_bus_bridge_dev() to release allocated pci_host_bridge in remove path. Use root bus bridge pointer to get host bridge pointer instead of searching host bridge list. That leaves the host bridge list unused, so remove it. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/host-bridge.c')
-rw-r--r--drivers/pci/host-bridge.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
index c49a1c482cfb..122df80592c3 100644
--- a/drivers/pci/host-bridge.c
+++ b/drivers/pci/host-bridge.c
@@ -9,13 +9,6 @@
#include "pci.h"
-static LIST_HEAD(pci_host_bridges);
-
-void add_to_pci_host_bridges(struct pci_host_bridge *bridge)
-{
- list_add_tail(&bridge->list, &pci_host_bridges);
-}
-
static struct pci_bus *find_pci_root_bus(struct pci_dev *dev)
{
struct pci_bus *bus;
@@ -30,14 +23,8 @@ static struct pci_bus *find_pci_root_bus(struct pci_dev *dev)
static struct pci_host_bridge *find_pci_host_bridge(struct pci_dev *dev)
{
struct pci_bus *bus = find_pci_root_bus(dev);
- struct pci_host_bridge *bridge;
-
- list_for_each_entry(bridge, &pci_host_bridges, list) {
- if (bridge->bus == bus)
- return bridge;
- }
- return NULL;
+ return to_pci_host_bridge(bus->bridge);
}
static bool resource_contains(struct resource *res1, struct resource *res2)
OpenPOWER on IntegriCloud