summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt2sas
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-02-25 13:54:20 -0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-27 12:12:18 -0800
commit210647af897af8ef2d00828aa2a6b1b42206aae6 (patch)
treebdb048c8fc7db6fb7b84134c1a6127c52da60ed3 /drivers/scsi/mpt2sas
parent3cf8b64380af6fd515740b010606ada4637818c5 (diff)
downloadblackbird-obmc-linux-210647af897af8ef2d00828aa2a6b1b42206aae6.tar.gz
blackbird-obmc-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/scsi/mpt2sas')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.c2
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)
pdev = ioc->pdev;
if ((pdev == NULL))
return -1;
- pci_remove_bus_device(pdev);
+ pci_stop_and_remove_bus_device(pdev);
return 0;
}
OpenPOWER on IntegriCloud