summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp2000/ixdp2x00.c
diff options
context:
space:
mode:
authorAlan Cox2006-10-16 17:49:50 +0200
committerRussell King2006-10-17 18:19:59 +0200
commit7281c248f797723f66244b7ecef204620f664648 (patch)
tree1d1c3d5ebfb3a1b51b82fcffc3f9832998493df2 /arch/arm/mach-ixp2000/ixdp2x00.c
parent[ARM] Update mach-types (diff)
downloadkernel-qcow2-linux-7281c248f797723f66244b7ecef204620f664648.tar.gz
kernel-qcow2-linux-7281c248f797723f66244b7ecef204620f664648.tar.xz
kernel-qcow2-linux-7281c248f797723f66244b7ecef204620f664648.zip
[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/ixdp2x00.c')
-rw-r--r--arch/arm/mach-ixp2000/ixdp2x00.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index af48cb52dfc4..aa2655092d2d 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -241,11 +241,14 @@ void ixdp2x00_slave_pci_postinit(void)
/*
* Remove PMC device is there is one
*/
- if((dev = pci_find_slot(1, IXDP2X00_PMC_DEVFN)))
+ if((dev = pci_get_bus_and_slot(1, IXDP2X00_PMC_DEVFN))) {
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
+ }
- dev = pci_find_slot(0, IXDP2X00_21555_DEVFN);
+ dev = pci_get_bus_and_slot(0, IXDP2X00_21555_DEVFN);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
}
/**************************************************************************