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/ixdp2800.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/ixdp2800.c')
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2800.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c index 91d36d91dac0..70d247f09a7e 100644 --- a/arch/arm/mach-ixp2000/ixdp2800.c +++ b/arch/arm/mach-ixp2000/ixdp2800.c | |||
@@ -261,14 +261,16 @@ int __init ixdp2800_pci_init(void) | |||
261 | 261 | ||
262 | pci_common_init(&ixdp2800_pci); | 262 | pci_common_init(&ixdp2800_pci); |
263 | if (ixdp2x00_master_npu()) { | 263 | if (ixdp2x00_master_npu()) { |
264 | dev = pci_find_slot(1, IXDP2800_SLAVE_ENET_DEVFN); | 264 | dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN); |
265 | pci_remove_bus_device(dev); | 265 | pci_remove_bus_device(dev); |
266 | pci_dev_put(dev); | ||
266 | 267 | ||
267 | ixdp2800_master_enable_slave(); | 268 | ixdp2800_master_enable_slave(); |
268 | ixdp2800_master_wait_for_slave_bus_scan(); | 269 | ixdp2800_master_wait_for_slave_bus_scan(); |
269 | } else { | 270 | } else { |
270 | dev = pci_find_slot(1, IXDP2800_MASTER_ENET_DEVFN); | 271 | dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN); |
271 | pci_remove_bus_device(dev); | 272 | pci_remove_bus_device(dev); |
273 | pci_dev_put(dev); | ||
272 | } | 274 | } |
273 | } | 275 | } |
274 | 276 | ||