summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-04-03 03:31:53 +0200
committerBjorn Helgaas <bhelgaas@google.com>2012-04-30 22:52:43 +0200
commit4fa2649a01a4357a82dcc60ef8fb7b8c441e64ed (patch)
treedfe8dd728396fd3034f20de91bb610422a9bc4e6 /drivers/pci
parentPCI: add generic device into pci_host_bridge struct (diff)
downloadlinux-4fa2649a01a4357a82dcc60ef8fb7b8c441e64ed.tar.xz
linux-4fa2649a01a4357a82dcc60ef8fb7b8c441e64ed.zip
PCI: add host bridge release support
We need a hook to release host bridge resources allocated when creating root bus. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host-bridge.c8
-rw-r--r--drivers/pci/probe.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
index 122df80592c3..a68dc613a5be 100644
--- a/drivers/pci/host-bridge.c
+++ b/drivers/pci/host-bridge.c
@@ -27,6 +27,14 @@ static struct pci_host_bridge *find_pci_host_bridge(struct pci_dev *dev)
return to_pci_host_bridge(bus->bridge);
}
+void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
+ void (*release_fn)(struct pci_host_bridge *),
+ void *release_data)
+{
+ bridge->release_fn = release_fn;
+ bridge->release_data = release_data;
+}
+
static bool resource_contains(struct resource *res1, struct resource *res2)
{
return res1->start <= res2->start && res1->end >= res2->end;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 8d291ee15257..4c2f22668ea7 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1137,7 +1137,8 @@ static void pci_release_bus_bridge_dev(struct device *dev)
{
struct pci_host_bridge *bridge = to_pci_host_bridge(dev);
- /* TODO: need to free window->res */
+ if (bridge->release_fn)
+ bridge->release_fn(bridge);
pci_free_resource_list(&bridge->windows);