diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-02-25 22:54:20 +0100 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-27 21:12:18 +0100 |
commit | 210647af897af8ef2d00828aa2a6b1b42206aae6 (patch) | |
tree | bdb048c8fc7db6fb7b84134c1a6127c52da60ed3 /arch/arm/mach-ixp2000/ixdp2400.c | |
parent | PCI: print out PCI device info along with duration (diff) | |
download | linux-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 'arch/arm/mach-ixp2000/ixdp2400.c')
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2400.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index f53e911ec94a..d519944653ad 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c @@ -134,11 +134,11 @@ static void ixdp2400_pci_postinit(void) if (ixdp2x00_master_npu()) { dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN); - pci_remove_bus_device(dev); + pci_stop_and_remove_bus_device(dev); pci_dev_put(dev); } else { dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN); - pci_remove_bus_device(dev); + pci_stop_and_remove_bus_device(dev); pci_dev_put(dev); ixdp2x00_slave_pci_postinit(); |