Merge branch 'pci/host-tegra' into next

[karo-tx-linux.git] / drivers / pci / hotplug / rpadlpar_core.c

diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index b46b57d870fc9e44c20564300248ca6fcd46cd32..dc67f39779ecd3cbfbd7d0f60eaafc627e85e2d2 100644 (file)
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -175,7 +175,7 @@ static int dlpar_add_pci_slot(char *drc_name, struct device_node *dn)
        struct pci_dev *dev;
        struct pci_controller *phb;
 
-       if (pcibios_find_pci_bus(dn))
+       if (pci_find_bus_by_node(dn))
                return -EINVAL;
 
        /* Add pci bus */
@@ -212,7 +212,7 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn)
        struct pci_dn *pdn;
        int rc = 0;
 
-       if (!pcibios_find_pci_bus(dn))
+       if (!pci_find_bus_by_node(dn))
                return -EINVAL;
 
        /* If pci slot is hotpluggable, use hotplug to remove it */
@@ -356,7 +356,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
 
        pci_lock_rescan_remove();
 
-       bus = pcibios_find_pci_bus(dn);
+       bus = pci_find_bus_by_node(dn);
        if (!bus) {
                ret = -EINVAL;
                goto out;
@@ -380,7 +380,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
        }
 
        /* Remove all devices below slot */
-       pcibios_remove_pci_devices(bus);
+       pci_hp_remove_devices(bus);
 
        /* Unmap PCI IO space */
        if (pcibios_unmap_io_space(bus)) {