|
@@ -468,6 +468,18 @@ static struct pci_bus * pci_alloc_bus(void)
|
|
return b;
|
|
return b;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void pci_release_host_bridge_dev(struct device *dev)
|
|
|
|
+{
|
|
|
|
+ struct pci_host_bridge *bridge = to_pci_host_bridge(dev);
|
|
|
|
+
|
|
|
|
+ if (bridge->release_fn)
|
|
|
|
+ bridge->release_fn(bridge);
|
|
|
|
+
|
|
|
|
+ pci_free_resource_list(&bridge->windows);
|
|
|
|
+
|
|
|
|
+ kfree(bridge);
|
|
|
|
+}
|
|
|
|
+
|
|
static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b)
|
|
static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b)
|
|
{
|
|
{
|
|
struct pci_host_bridge *bridge;
|
|
struct pci_host_bridge *bridge;
|
|
@@ -1189,18 +1201,6 @@ int pci_cfg_space_size(struct pci_dev *dev)
|
|
return PCI_CFG_SPACE_SIZE;
|
|
return PCI_CFG_SPACE_SIZE;
|
|
}
|
|
}
|
|
|
|
|
|
-static void pci_release_bus_bridge_dev(struct device *dev)
|
|
|
|
-{
|
|
|
|
- struct pci_host_bridge *bridge = to_pci_host_bridge(dev);
|
|
|
|
-
|
|
|
|
- if (bridge->release_fn)
|
|
|
|
- bridge->release_fn(bridge);
|
|
|
|
-
|
|
|
|
- pci_free_resource_list(&bridge->windows);
|
|
|
|
-
|
|
|
|
- kfree(bridge);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
struct pci_dev *pci_alloc_dev(struct pci_bus *bus)
|
|
struct pci_dev *pci_alloc_dev(struct pci_bus *bus)
|
|
{
|
|
{
|
|
struct pci_dev *dev;
|
|
struct pci_dev *dev;
|
|
@@ -1708,7 +1708,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
|
|
goto err_out;
|
|
goto err_out;
|
|
|
|
|
|
bridge->dev.parent = parent;
|
|
bridge->dev.parent = parent;
|
|
- bridge->dev.release = pci_release_bus_bridge_dev;
|
|
|
|
|
|
+ bridge->dev.release = pci_release_host_bridge_dev;
|
|
dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus);
|
|
dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus);
|
|
error = pcibios_root_bridge_prepare(bridge);
|
|
error = pcibios_root_bridge_prepare(bridge);
|
|
if (error) {
|
|
if (error) {
|