aboutsummaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-02-25 13:54:22 -0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-27 12:14:55 -0800
commit6754b9e9c33502223db066de50dda8a876f70c2c (patch)
treeee7b1a9328bd01675f907c9d247ee9b2f4bad21f /drivers/pcmcia
parent210647af897af8ef2d00828aa2a6b1b42206aae6 (diff)
downloadlinux-6754b9e9c33502223db066de50dda8a876f70c2c.tar.gz
PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
The old pci_remove_behind_bridge actually do stop and remove. Make the name reflect that to reduce confusion. 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/pcmcia')
-rw-r--r--drivers/pcmcia/cardbus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 9a58862f140..6e75153c5b4 100644
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -108,5 +108,5 @@ void cb_free(struct pcmcia_socket *s)
struct pci_dev *bridge = s->cb_dev;
if (bridge)
- pci_remove_behind_bridge(bridge);
+ pci_stop_and_remove_behind_bridge(bridge);
}