diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-02-25 16:54:20 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-27 15:12:18 -0500 |
commit | 210647af897af8ef2d00828aa2a6b1b42206aae6 (patch) | |
tree | bdb048c8fc7db6fb7b84134c1a6127c52da60ed3 /drivers/pci/pci-sysfs.c | |
parent | 3cf8b64380af6fd515740b010606ada4637818c5 (diff) |
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/pci-sysfs.c')
-rw-r--r-- | drivers/pci/pci-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index d9723039e99a..a55e248618cd 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
@@ -330,7 +330,7 @@ static void remove_callback(struct device *dev) | |||
330 | struct pci_dev *pdev = to_pci_dev(dev); | 330 | struct pci_dev *pdev = to_pci_dev(dev); |
331 | 331 | ||
332 | mutex_lock(&pci_remove_rescan_mutex); | 332 | mutex_lock(&pci_remove_rescan_mutex); |
333 | pci_remove_bus_device(pdev); | 333 | pci_stop_and_remove_bus_device(pdev); |
334 | mutex_unlock(&pci_remove_rescan_mutex); | 334 | mutex_unlock(&pci_remove_rescan_mutex); |
335 | } | 335 | } |
336 | 336 | ||