summaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/shpchp_pci.c
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/pci/hotplug/shpchp_pci.c
parent3cf8b64380af6fd515740b010606ada4637818c5 (diff)
downloadblackbird-op-linux-210647af897af8ef2d00828aa2a6b1b42206aae6.tar.gz
blackbird-op-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/hotplug/shpchp_pci.c')
-rw-r--r--drivers/pci/hotplug/shpchp_pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index a2ccfcd3c298..df7e4bfadae3 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -124,7 +124,7 @@ int shpchp_unconfigure_device(struct slot *p_slot)
break;
}
}
- pci_remove_bus_device(temp);
+ pci_stop_and_remove_bus_device(temp);
pci_dev_put(temp);
}
return rc;
OpenPOWER on IntegriCloud