diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-02-25 22:54:20 +0100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-27 21:12:18 +0100 |
| commit | 210647af897af8ef2d00828aa2a6b1b42206aae6 (patch) | |
| tree | bdb048c8fc7db6fb7b84134c1a6127c52da60ed3 /drivers/pci/xen-pcifront.c | |
| parent | PCI: print out PCI device info along with duration (diff) | |
| download | linux-210647af897af8ef2d00828aa2a6b1b42206aae6.tar.xz linux-210647af897af8ef2d00828aa2a6b1b42206aae6.zip | |
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>
Diffstat (limited to 'drivers/pci/xen-pcifront.c')
| -rw-r--r-- | drivers/pci/xen-pcifront.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 7cf3d2fcf56a..fb8a39c7c3d6 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -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, |