mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-29 07:04:10 +08:00
PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device
The old pci_remove_bus_device actually did stop and remove. Make the name reflect that to reduce confusion. This patch is done by sed scripts and changes back some incorrect __pci_remove_bus_device changes. Suggested-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
parent
3cf8b64380
commit
210647af89
@ -134,11 +134,11 @@ static void ixdp2400_pci_postinit(void)
|
||||
|
||||
if (ixdp2x00_master_npu()) {
|
||||
dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
} else {
|
||||
dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN);
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
|
||||
ixdp2x00_slave_pci_postinit();
|
||||
|
@ -262,14 +262,14 @@ int __init ixdp2800_pci_init(void)
|
||||
pci_common_init(&ixdp2800_pci);
|
||||
if (ixdp2x00_master_npu()) {
|
||||
dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN);
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
|
||||
ixdp2800_master_enable_slave();
|
||||
ixdp2800_master_wait_for_slave_bus_scan();
|
||||
} else {
|
||||
dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN);
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
}
|
||||
}
|
||||
|
@ -239,12 +239,12 @@ void ixdp2x00_slave_pci_postinit(void)
|
||||
* Remove PMC device is there is one
|
||||
*/
|
||||
if((dev = pci_get_bus_and_slot(1, IXDP2X00_PMC_DEVFN))) {
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
}
|
||||
|
||||
dev = pci_get_bus_and_slot(0, IXDP2X00_21555_DEVFN);
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
}
|
||||
|
||||
|
@ -84,7 +84,7 @@ void pcibios_remove_pci_devices(struct pci_bus *bus)
|
||||
list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
|
||||
pr_debug(" * Removing %s...\n", pci_name(dev));
|
||||
eeh_remove_bus_device(dev);
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(pcibios_remove_pci_devices);
|
||||
|
@ -346,7 +346,7 @@ static int mpt_remove_dead_ioc_func(void *arg)
|
||||
if ((pdev == NULL))
|
||||
return -1;
|
||||
|
||||
pci_remove_bus_device(pdev);
|
||||
pci_stop_and_remove_bus_device(pdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -910,7 +910,7 @@ static int disable_device(struct acpiphp_slot *slot)
|
||||
disable_bridges(pdev->subordinate);
|
||||
pci_disable_device(pdev);
|
||||
}
|
||||
pci_remove_bus_device(pdev);
|
||||
pci_stop_and_remove_bus_device(pdev);
|
||||
pci_dev_put(pdev);
|
||||
}
|
||||
}
|
||||
@ -1067,7 +1067,7 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus)
|
||||
res->end) {
|
||||
/* Could not assign a required resources
|
||||
* for this device, remove it */
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -341,7 +341,7 @@ int cpci_unconfigure_slot(struct slot* slot)
|
||||
dev = pci_get_slot(slot->bus,
|
||||
PCI_DEVFN(PCI_SLOT(slot->devfn), i));
|
||||
if (dev) {
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
}
|
||||
}
|
||||
|
@ -127,7 +127,7 @@ int cpqhp_unconfigure_device(struct pci_func* func)
|
||||
struct pci_dev* temp = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, j));
|
||||
if (temp) {
|
||||
pci_dev_put(temp);
|
||||
pci_remove_bus_device(temp);
|
||||
pci_stop_and_remove_bus_device(temp);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
@ -40,7 +40,7 @@ static ssize_t legacy_show(struct kobject *kobj, struct attribute *attr,
|
||||
|
||||
static void remove_callback(void *data)
|
||||
{
|
||||
pci_remove_bus_device((struct pci_dev *)data);
|
||||
pci_stop_and_remove_bus_device((struct pci_dev *)data);
|
||||
}
|
||||
|
||||
static ssize_t legacy_store(struct kobject *kobj, struct attribute *attr,
|
||||
|
@ -721,7 +721,7 @@ static void ibm_unconfigure_device(struct pci_func *func)
|
||||
for (j = 0; j < 0x08; j++) {
|
||||
temp = pci_get_bus_and_slot(func->busno, (func->device << 3) | j);
|
||||
if (temp) {
|
||||
pci_remove_bus_device(temp);
|
||||
pci_stop_and_remove_bus_device(temp);
|
||||
pci_dev_put(temp);
|
||||
}
|
||||
}
|
||||
|
@ -141,7 +141,7 @@ int pciehp_unconfigure_device(struct slot *p_slot)
|
||||
break;
|
||||
}
|
||||
}
|
||||
pci_remove_bus_device(temp);
|
||||
pci_stop_and_remove_bus_device(temp);
|
||||
/*
|
||||
* Ensure that no new Requests will be generated from
|
||||
* the device.
|
||||
|
@ -389,7 +389,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
|
||||
BUG_ON(!bus->self);
|
||||
pr_debug("PCI: Now removing bridge device %s\n", pci_name(bus->self));
|
||||
eeh_remove_bus_device(bus->self);
|
||||
pci_remove_bus_device(bus->self);
|
||||
pci_stop_and_remove_bus_device(bus->self);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -554,7 +554,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
|
||||
PCI_FUNC(func)));
|
||||
if (dev) {
|
||||
sn_bus_free_data(dev);
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
}
|
||||
}
|
||||
|
@ -124,7 +124,7 @@ int shpchp_unconfigure_device(struct slot *p_slot)
|
||||
break;
|
||||
}
|
||||
}
|
||||
pci_remove_bus_device(temp);
|
||||
pci_stop_and_remove_bus_device(temp);
|
||||
pci_dev_put(temp);
|
||||
}
|
||||
return rc;
|
||||
|
@ -142,7 +142,7 @@ failed2:
|
||||
failed1:
|
||||
pci_dev_put(dev);
|
||||
mutex_lock(&iov->dev->sriov->lock);
|
||||
pci_remove_bus_device(virtfn);
|
||||
pci_stop_and_remove_bus_device(virtfn);
|
||||
virtfn_remove_bus(dev->bus, virtfn_bus(dev, id));
|
||||
mutex_unlock(&iov->dev->sriov->lock);
|
||||
|
||||
@ -182,7 +182,7 @@ static void virtfn_remove(struct pci_dev *dev, int id, int reset)
|
||||
sysfs_remove_link(&virtfn->dev.kobj, "physfn");
|
||||
|
||||
mutex_lock(&iov->dev->sriov->lock);
|
||||
pci_remove_bus_device(virtfn);
|
||||
pci_stop_and_remove_bus_device(virtfn);
|
||||
virtfn_remove_bus(dev->bus, virtfn_bus(dev, id));
|
||||
mutex_unlock(&iov->dev->sriov->lock);
|
||||
|
||||
|
@ -330,7 +330,7 @@ static void remove_callback(struct device *dev)
|
||||
struct pci_dev *pdev = to_pci_dev(dev);
|
||||
|
||||
mutex_lock(&pci_remove_rescan_mutex);
|
||||
pci_remove_bus_device(pdev);
|
||||
pci_stop_and_remove_bus_device(pdev);
|
||||
mutex_unlock(&pci_remove_rescan_mutex);
|
||||
}
|
||||
|
||||
|
@ -79,7 +79,7 @@ EXPORT_SYMBOL(pci_remove_bus);
|
||||
|
||||
static void __pci_remove_behind_bridge(struct pci_dev *dev);
|
||||
/**
|
||||
* pci_remove_bus_device - remove a PCI device and any children
|
||||
* pci_stop_and_remove_bus_device - remove a PCI device and any children
|
||||
* @dev: the device to remove
|
||||
*
|
||||
* Remove a PCI device from the device lists, informing the drivers
|
||||
@ -102,7 +102,7 @@ static void __pci_remove_bus_device(struct pci_dev *dev)
|
||||
|
||||
pci_destroy_dev(dev);
|
||||
}
|
||||
void pci_remove_bus_device(struct pci_dev *dev)
|
||||
void pci_stop_and_remove_bus_device(struct pci_dev *dev)
|
||||
{
|
||||
pci_stop_bus_device(dev);
|
||||
__pci_remove_bus_device(dev);
|
||||
@ -145,7 +145,7 @@ static void pci_stop_bus_devices(struct pci_bus *bus)
|
||||
struct list_head *l, *n;
|
||||
|
||||
/*
|
||||
* VFs could be removed by pci_remove_bus_device() in the
|
||||
* VFs could be removed by pci_stop_and_remove_bus_device() in the
|
||||
* pci_stop_bus_devices() code path for PF.
|
||||
* aka, bus->devices get updated in the process.
|
||||
* but VFs are inserted after PFs when SRIOV is enabled for PF,
|
||||
@ -174,6 +174,6 @@ void pci_stop_bus_device(struct pci_dev *dev)
|
||||
pci_stop_dev(dev);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(pci_remove_bus_device);
|
||||
EXPORT_SYMBOL(pci_stop_and_remove_bus_device);
|
||||
EXPORT_SYMBOL(pci_remove_behind_bridge);
|
||||
EXPORT_SYMBOL_GPL(pci_stop_bus_device);
|
||||
|
@ -544,7 +544,7 @@ static void free_root_bus_devs(struct pci_bus *bus)
|
||||
dev = container_of(bus->devices.next, struct pci_dev,
|
||||
bus_list);
|
||||
dev_dbg(&dev->dev, "removing device\n");
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1045,7 +1045,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
|
||||
domain, bus, slot, func);
|
||||
continue;
|
||||
}
|
||||
pci_remove_bus_device(pci_dev);
|
||||
pci_stop_and_remove_bus_device(pci_dev);
|
||||
pci_dev_put(pci_dev);
|
||||
|
||||
dev_dbg(&pdev->xdev->dev,
|
||||
|
@ -571,7 +571,7 @@ static void asus_rfkill_hotplug(struct asus_wmi *asus)
|
||||
} else {
|
||||
dev = pci_get_slot(bus, 0);
|
||||
if (dev) {
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
}
|
||||
}
|
||||
|
@ -646,7 +646,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
|
||||
} else {
|
||||
dev = pci_get_slot(bus, 0);
|
||||
if (dev) {
|
||||
pci_remove_bus_device(dev);
|
||||
pci_stop_and_remove_bus_device(dev);
|
||||
pci_dev_put(dev);
|
||||
}
|
||||
}
|
||||
|
@ -132,7 +132,7 @@ static int mpt2sas_remove_dead_ioc_func(void *arg)
|
||||
pdev = ioc->pdev;
|
||||
if ((pdev == NULL))
|
||||
return -1;
|
||||
pci_remove_bus_device(pdev);
|
||||
pci_stop_and_remove_bus_device(pdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -686,7 +686,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp);
|
||||
extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
|
||||
extern void pci_dev_put(struct pci_dev *dev);
|
||||
extern void pci_remove_bus(struct pci_bus *b);
|
||||
extern void pci_remove_bus_device(struct pci_dev *dev);
|
||||
extern void pci_stop_and_remove_bus_device(struct pci_dev *dev);
|
||||
extern void pci_stop_bus_device(struct pci_dev *dev);
|
||||
void pci_setup_cardbus(struct pci_bus *bus);
|
||||
extern void pci_sort_breadthfirst(void);
|
||||
|
Loading…
Reference in New Issue
Block a user