diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-10-16 11:49:50 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-10-17 12:19:59 -0400 |
commit | 7281c248f797723f66244b7ecef204620f664648 (patch) | |
tree | 1d1c3d5ebfb3a1b51b82fcffc3f9832998493df2 /arch/arm/mach-ixp2000/ixdp2400.c | |
parent | 0f6f65f607b6d516fa001e8cdf5a2618c81372f5 (diff) |
[ARM] switch to new pci_get_bus_and_slot API
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2400.c')
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2400.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index a6f14801872d..9ee63834e603 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c | |||
@@ -133,11 +133,13 @@ static void ixdp2400_pci_postinit(void) | |||
133 | struct pci_dev *dev; | 133 | struct pci_dev *dev; |
134 | 134 | ||
135 | if (ixdp2x00_master_npu()) { | 135 | if (ixdp2x00_master_npu()) { |
136 | dev = pci_find_slot(1, IXDP2400_SLAVE_ENET_DEVFN); | 136 | dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN); |
137 | pci_remove_bus_device(dev); | 137 | pci_remove_bus_device(dev); |
138 | pci_dev_put(dev) | ||
138 | } else { | 139 | } else { |
139 | dev = pci_find_slot(1, IXDP2400_MASTER_ENET_DEVFN); | 140 | dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN); |
140 | pci_remove_bus_device(dev); | 141 | pci_remove_bus_device(dev); |
142 | pci_dev_put(dev) | ||
141 | 143 | ||
142 | ixdp2x00_slave_pci_postinit(); | 144 | ixdp2x00_slave_pci_postinit(); |
143 | } | 145 | } |