summaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-02-25 22:54:20 +0100
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-27 21:12:18 +0100
commit210647af897af8ef2d00828aa2a6b1b42206aae6 (patch)
treebdb048c8fc7db6fb7b84134c1a6127c52da60ed3 /drivers/message/fusion
parentPCI: print out PCI device info along with duration (diff)
downloadlinux-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/message/fusion')
-rw-r--r--drivers/message/fusion/mptbase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index a7dc4672d996..a5c591ffe395 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -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;
}