powerpc/pci: Rename pcibios_{add, remove}_pci_devices()
This renames pcibios_{add,remove}_pci_devices() to avoid conflicts with names of the weak functions in PCI subsystem, which have the prefix "pcibios". No logical changes introduced. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Reviewed-By: Alistair Popple <alistair@popple.id.au> Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
1e9167726c
commit
bd251b893d
|
@ -260,10 +260,10 @@ static inline struct eeh_dev *pdn_to_eeh_dev(struct pci_dn *pdn)
|
|||
extern struct pci_bus *pcibios_find_pci_bus(struct device_node *dn);
|
||||
|
||||
/** Remove all of the PCI devices under this bus */
|
||||
extern void pcibios_remove_pci_devices(struct pci_bus *bus);
|
||||
extern void pci_hp_remove_devices(struct pci_bus *bus);
|
||||
|
||||
/** Discover new pci devices under this bus, and add them */
|
||||
extern void pcibios_add_pci_devices(struct pci_bus *bus);
|
||||
extern void pci_hp_add_devices(struct pci_bus *bus);
|
||||
|
||||
|
||||
extern void isa_bridge_find_early(struct pci_controller *hose);
|
||||
|
|
|
@ -621,7 +621,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
|
|||
* We don't remove the corresponding PE instances because
|
||||
* we need the information afterwords. The attached EEH
|
||||
* devices are expected to be attached soon when calling
|
||||
* into pcibios_add_pci_devices().
|
||||
* into pci_hp_add_devices().
|
||||
*/
|
||||
eeh_pe_state_mark(pe, EEH_PE_KEEP);
|
||||
if (bus) {
|
||||
|
@ -630,7 +630,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
|
|||
} else {
|
||||
eeh_pe_state_clear(pe, EEH_PE_PRI_BUS);
|
||||
pci_lock_rescan_remove();
|
||||
pcibios_remove_pci_devices(bus);
|
||||
pci_hp_remove_devices(bus);
|
||||
pci_unlock_rescan_remove();
|
||||
}
|
||||
} else if (frozen_bus) {
|
||||
|
@ -681,7 +681,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
|
|||
if (pe->type & EEH_PE_VF)
|
||||
eeh_add_virt_device(edev, NULL);
|
||||
else
|
||||
pcibios_add_pci_devices(bus);
|
||||
pci_hp_add_devices(bus);
|
||||
} else if (frozen_bus && rmv_data->removed) {
|
||||
pr_info("EEH: Sleep 5s ahead of partial hotplug\n");
|
||||
ssleep(5);
|
||||
|
@ -691,7 +691,7 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus,
|
|||
if (pe->type & EEH_PE_VF)
|
||||
eeh_add_virt_device(edev, NULL);
|
||||
else
|
||||
pcibios_add_pci_devices(frozen_bus);
|
||||
pci_hp_add_devices(frozen_bus);
|
||||
}
|
||||
eeh_pe_state_clear(pe, EEH_PE_KEEP);
|
||||
|
||||
|
@ -896,7 +896,7 @@ perm_error:
|
|||
eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED);
|
||||
|
||||
pci_lock_rescan_remove();
|
||||
pcibios_remove_pci_devices(frozen_bus);
|
||||
pci_hp_remove_devices(frozen_bus);
|
||||
pci_unlock_rescan_remove();
|
||||
}
|
||||
}
|
||||
|
@ -981,7 +981,7 @@ static void eeh_handle_special_event(void)
|
|||
bus = eeh_pe_bus_get(phb_pe);
|
||||
eeh_pe_dev_traverse(pe,
|
||||
eeh_report_failure, NULL);
|
||||
pcibios_remove_pci_devices(bus);
|
||||
pci_hp_remove_devices(bus);
|
||||
}
|
||||
pci_unlock_rescan_remove();
|
||||
}
|
||||
|
|
|
@ -38,20 +38,20 @@ void pcibios_release_device(struct pci_dev *dev)
|
|||
}
|
||||
|
||||
/**
|
||||
* pcibios_remove_pci_devices - remove all devices under this bus
|
||||
* pci_hp_remove_devices - remove all devices under this bus
|
||||
* @bus: the indicated PCI bus
|
||||
*
|
||||
* Remove all of the PCI devices under this bus both from the
|
||||
* linux pci device tree, and from the powerpc EEH address cache.
|
||||
*/
|
||||
void pcibios_remove_pci_devices(struct pci_bus *bus)
|
||||
void pci_hp_remove_devices(struct pci_bus *bus)
|
||||
{
|
||||
struct pci_dev *dev, *tmp;
|
||||
struct pci_bus *child_bus;
|
||||
|
||||
/* First go down child busses */
|
||||
list_for_each_entry(child_bus, &bus->children, node)
|
||||
pcibios_remove_pci_devices(child_bus);
|
||||
pci_hp_remove_devices(child_bus);
|
||||
|
||||
pr_debug("PCI: Removing devices on bus %04x:%02x\n",
|
||||
pci_domain_nr(bus), bus->number);
|
||||
|
@ -60,11 +60,10 @@ void pcibios_remove_pci_devices(struct pci_bus *bus)
|
|||
pci_stop_and_remove_bus_device(dev);
|
||||
}
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(pcibios_remove_pci_devices);
|
||||
EXPORT_SYMBOL_GPL(pci_hp_remove_devices);
|
||||
|
||||
/**
|
||||
* pcibios_add_pci_devices - adds new pci devices to bus
|
||||
* pci_hp_add_devices - adds new pci devices to bus
|
||||
* @bus: the indicated PCI bus
|
||||
*
|
||||
* This routine will find and fixup new pci devices under
|
||||
|
@ -74,7 +73,7 @@ EXPORT_SYMBOL_GPL(pcibios_remove_pci_devices);
|
|||
* is how this routine differs from other, similar pcibios
|
||||
* routines.)
|
||||
*/
|
||||
void pcibios_add_pci_devices(struct pci_bus * bus)
|
||||
void pci_hp_add_devices(struct pci_bus *bus)
|
||||
{
|
||||
int slotno, mode, pass, max;
|
||||
struct pci_dev *dev;
|
||||
|
@ -114,4 +113,4 @@ void pcibios_add_pci_devices(struct pci_bus * bus)
|
|||
}
|
||||
pcibios_finish_adding_to_bus(bus);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(pcibios_add_pci_devices);
|
||||
EXPORT_SYMBOL_GPL(pci_hp_add_devices);
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -404,7 +404,7 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
|
|||
|
||||
if (state == PRESENT) {
|
||||
pci_lock_rescan_remove();
|
||||
pcibios_add_pci_devices(slot->bus);
|
||||
pci_hp_add_devices(slot->bus);
|
||||
pci_unlock_rescan_remove();
|
||||
slot->state = CONFIGURED;
|
||||
} else if (state == EMPTY) {
|
||||
|
@ -426,7 +426,7 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
|
|||
return -EINVAL;
|
||||
|
||||
pci_lock_rescan_remove();
|
||||
pcibios_remove_pci_devices(slot->bus);
|
||||
pci_hp_remove_devices(slot->bus);
|
||||
pci_unlock_rescan_remove();
|
||||
vm_unmap_aliases();
|
||||
|
||||
|
|
|
@ -116,7 +116,7 @@ int rpaphp_enable_slot(struct slot *slot)
|
|||
}
|
||||
|
||||
if (list_empty(&bus->devices))
|
||||
pcibios_add_pci_devices(bus);
|
||||
pci_hp_add_devices(bus);
|
||||
|
||||
if (!list_empty(&bus->devices)) {
|
||||
info->adapter_status = CONFIGURED;
|
||||
|
|
Loading…
Reference in New Issue