From d90b3fe351689a8b99480df8ecdeaa6c4c08f716 Mon Sep 17 00:00:00 2001 From: "linas@austin.ibm.com" Date: Thu, 1 Dec 2005 18:59:58 -0600 Subject: [PATCH] --- yaml --- r: 17503 b: refs/heads/master c: cd5b50be8d8e8e6170da3a261fc625fd603f9dc4 h: refs/heads/master i: 17501: 02b677cf643f69ab15f76b6df62bfff643ae19ab 17499: 97a5f8bdcd2c5f1a7cb1da9ee7fa668ea5a91519 17495: 43e3aa912e2f6352084aba57530539b5eb5a49d4 17487: b88a3270dc1b37aa905e382826767d727e66909c 17471: c8f5f37877c96ee55def1dccfc847d236abc4480 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/rpadlpar_core.c | 24 +---------------------- trunk/drivers/pci/hotplug/rpaphp_pci.c | 24 +---------------------- 3 files changed, 3 insertions(+), 47 deletions(-) diff --git a/[refs] b/[refs] index b561b526dd43..944567859bf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d681db4aed4453c7d34adfbb64956271186514e9 +refs/heads/master: cd5b50be8d8e8e6170da3a261fc625fd603f9dc4 diff --git a/trunk/drivers/pci/hotplug/rpadlpar_core.c b/trunk/drivers/pci/hotplug/rpadlpar_core.c index 0173641c4149..7d93dbaf628d 100644 --- a/trunk/drivers/pci/hotplug/rpadlpar_core.c +++ b/trunk/drivers/pci/hotplug/rpadlpar_core.c @@ -112,28 +112,6 @@ static struct slot *find_slot(struct device_node *dn) return NULL; } -static void rpadlpar_claim_one_bus(struct pci_bus *b) -{ - struct list_head *ld; - struct pci_bus *child_bus; - - for (ld = b->devices.next; ld != &b->devices; ld = ld->next) { - struct pci_dev *dev = pci_dev_b(ld); - int i; - - for (i = 0; i < PCI_NUM_RESOURCES; i++) { - struct resource *r = &dev->resource[i]; - - if (r->parent || !r->start || !r->flags) - continue; - rpaphp_claim_resource(dev, i); - } - } - - list_for_each_entry(child_bus, &b->children, node) - rpadlpar_claim_one_bus(child_bus); -} - static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent, struct device_node *dev_dn) { @@ -171,7 +149,7 @@ static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn) rpaphp_init_new_devs(dev->subordinate); /* Claim new bus resources */ - rpadlpar_claim_one_bus(dev->bus); + pcibios_claim_one_bus(dev->bus); /* ioremap() for child bus, which may or may not succeed */ (void) remap_bus_range(dev->bus); diff --git a/trunk/drivers/pci/hotplug/rpaphp_pci.c b/trunk/drivers/pci/hotplug/rpaphp_pci.c index fc2368710cf7..6f21c73be3c0 100644 --- a/trunk/drivers/pci/hotplug/rpaphp_pci.c +++ b/trunk/drivers/pci/hotplug/rpaphp_pci.c @@ -62,28 +62,6 @@ struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn) } EXPORT_SYMBOL_GPL(rpaphp_find_pci_bus); -int rpaphp_claim_resource(struct pci_dev *dev, int resource) -{ - struct resource *res = &dev->resource[resource]; - struct resource *root = pci_find_parent_resource(dev, res); - char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge"; - int err = -EINVAL; - - if (root != NULL) { - err = request_resource(root, res); - } - - if (err) { - err("PCI: %s region %d of %s %s [%lx:%lx]\n", - root ? "Address space collision on" : - "No parent found for", - resource, dtype, pci_name(dev), res->start, res->end); - } - return err; -} - -EXPORT_SYMBOL_GPL(rpaphp_claim_resource); - static int rpaphp_get_sensor_state(struct slot *slot, int *state) { int rc; @@ -177,7 +155,7 @@ void rpaphp_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus) if (r->parent || !r->start || !r->flags) continue; - rpaphp_claim_resource(dev, i); + pci_claim_resource(dev, i); } } }