On Tue, Apr 19, 2016 at 03:28:36PM +1000, Alexey Kardashevskiy wrote:
>On 02/17/2016 02:44 PM, Gavin Shan wrote:
>>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@xxxxxxxxxxxxxxxxxx>
>>---
>> arch/powerpc/include/asm/pci-bridge.h | 4 ++--
>> arch/powerpc/kernel/eeh_driver.c | 12 ++++++------
>> arch/powerpc/kernel/pci-hotplug.c | 15 +++++++--------
>> drivers/pci/hotplug/rpadlpar_core.c | 2 +-
>> drivers/pci/hotplug/rpaphp_core.c | 4 ++--
>> drivers/pci/hotplug/rpaphp_pci.c | 2 +-
>> 6 files changed, 19 insertions(+), 20 deletions(-)
>>
>>diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
>>index 4dd6ef4..c817f38 100644
>>--- a/arch/powerpc/include/asm/pci-bridge.h
>>+++ b/arch/powerpc/include/asm/pci-bridge.h
>>@@ -263,10 +263,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_remove_pci_devices(struct pci_bus *bus);
>
>
>pci_lala_pci_lala() ("pci" is used twice) looks weird, if the prefix is
>"pci", what other device types can they handle?...
>
>May be pcihp_add_devices(), pcihp_remove_devices() as these as defined in
>pci-hotplug.c?
>
I assume you're talking about drivers/pci/hotplug/pci_hotplug_core.c.
pci_hotplug_core.c uses pci_hp_ prefix rather than pcihp_. I will
rename them to pci_hp_*() in next revision.
gwshan@gwshan:~/sandbox/linux$ find . -name pci-hotplug.c
./arch/powerpc/kernel/pci-hotplug.c
gwshan@gwshan:~/sandbox/linux$ grep pci*hp arch/powerpc/kernel/pci-hotplug.c
>
>>
>> /** Discover new pci devices under this bus, and add them */
>>-extern void pcibios_add_pci_devices(struct pci_bus *bus);
>>+extern void pci_add_pci_devices(struct pci_bus *bus);
>>
>>
>> extern void isa_bridge_find_early(struct pci_controller *hose);
>>diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
>>index fb6207d..59e53fe 100644
>>--- a/arch/powerpc/kernel/eeh_driver.c
>>+++ b/arch/powerpc/kernel/eeh_driver.c
>>@@ -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_add_pci_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_remove_pci_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_add_pci_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_add_pci_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_remove_pci_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_remove_pci_devices(bus);
>> }
>> pci_unlock_rescan_remove();
>> }
>>diff --git a/arch/powerpc/kernel/pci-hotplug.c b/arch/powerpc/kernel/pci-hotplug.c
>>index 59c4361..78bf2a1 100644
>>--- a/arch/powerpc/kernel/pci-hotplug.c
>>+++ b/arch/powerpc/kernel/pci-hotplug.c
>>@@ -38,20 +38,20 @@ void pcibios_release_device(struct pci_dev *dev)
>> }
>>
>> /**
>>- * pcibios_remove_pci_devices - remove all devices under this bus
>>+ * pci_remove_pci_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_remove_pci_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_remove_pci_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_remove_pci_devices);
>>
>> /**
>>- * pcibios_add_pci_devices - adds new pci devices to bus
>>+ * pci_add_pci_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_add_pci_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_add_pci_devices);
>>diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
>>index b46b57d..730982b 100644
>>--- a/drivers/pci/hotplug/rpadlpar_core.c
>>+++ b/drivers/pci/hotplug/rpadlpar_core.c
>>@@ -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_remove_pci_devices(bus);
>>
>> /* Unmap PCI IO space */
>> if (pcibios_unmap_io_space(bus)) {
>>diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
>>index 611f605..bba07b3 100644
>>--- a/drivers/pci/hotplug/rpaphp_core.c
>>+++ b/drivers/pci/hotplug/rpaphp_core.c
>>@@ -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_add_pci_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_remove_pci_devices(slot->bus);
>> pci_unlock_rescan_remove();
>> vm_unmap_aliases();
>>
>>diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
>>index 7836d69..1099b38 100644
>>--- a/drivers/pci/hotplug/rpaphp_pci.c
>>+++ b/drivers/pci/hotplug/rpaphp_pci.c
>>@@ -116,7 +116,7 @@ int rpaphp_enable_slot(struct slot *slot)
>> }
>>
>> if (list_empty(&bus->devices))
>>- pcibios_add_pci_devices(bus);
>>+ pci_add_pci_devices(bus);
>>
>> if (!list_empty(&bus->devices)) {
>> info->adapter_status = CONFIGURED;
>>
>
>
>--
>Alexey
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
