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/scsi/mpt2sas | |
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/scsi/mpt2sas')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 0b2c95583660..c7d5a921a430 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -132,7 +132,7 @@ static int mpt2sas_remove_dead_ioc_func(void *arg) | |||
132 | pdev = ioc->pdev; | 132 | pdev = ioc->pdev; |
133 | if ((pdev == NULL)) | 133 | if ((pdev == NULL)) |
134 | return -1; | 134 | return -1; |
135 | pci_remove_bus_device(pdev); | 135 | pci_stop_and_remove_bus_device(pdev); |
136 | return 0; | 136 | return 0; |
137 | } | 137 | } |
138 | 138 | ||