[PATCH] PCI Hotplug/powerpc: more removal of duplicated code

The RPAPHP code contains two routines that appear to be gratuitous copies
of very similar pci code.  In particular,

   rpaphp_claim_resource ~~ pci_claim_resource
      (there is a minor, non-functional difference)

   rpadlpar_claim_one_bus == pcibios_claim_one_bus
      (the code is identical)

This patch removes the rpaphp versions of the code.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Acked-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 2 insertions, 46 deletions

diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 0173641c4149..7d93dbaf628d 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/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/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index fc2368710cf7..6f21c73be3c0 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/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);
                         }
                 }
         }