2006-10-16 15:23:16

by Alan

Subject: [PATCH] arm: switch to new pci_get_bus_and_slot API

Signed-off-by: Alan Cox <[email protected]>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c
--- linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c 2006-10-13 15:06:14.000000000 +0100
+++ linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c 2006-10-13 17:14:23.000000000 +0100
@@ -133,11 +133,13 @@
struct pci_dev *dev;

if (ixdp2x00_master_npu()) {
- dev = pci_find_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
+ dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
pci_remove_bus_device(dev);
+ pci_dev_put(dev)
} else {
- dev = pci_find_slot(1, IXDP2400_MASTER_ENET_DEVFN);
+ dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN);
pci_remove_bus_device(dev);
+ pci_dev_put(dev)

ixdp2x00_slave_pci_postinit();
}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2800.c linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2800.c
--- linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2800.c 2006-10-13 15:06:14.000000000 +0100
+++ linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2800.c 2006-10-13 17:14:23.000000000 +0100
@@ -261,14 +261,16 @@

pci_common_init(&ixdp2800_pci);
if (ixdp2x00_master_npu()) {
- dev = pci_find_slot(1, IXDP2800_SLAVE_ENET_DEVFN);
+ dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);

ixdp2800_master_enable_slave();
ixdp2800_master_wait_for_slave_bus_scan();
} else {
- dev = pci_find_slot(1, IXDP2800_MASTER_ENET_DEVFN);
+ dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN);
pci_remove_bus_device(dev);
+ pci_dev_put(dev);
}
}

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2x00.c linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2x00.c
--- linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2x00.c 2006-10-13 15:10:06.000000000 +0100
+++ linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2x00.c 2006-10-13 17:14:23.000000000 +0100
@@ -241,11 +241,14 @@
/*
* 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);
}

/**************************************************************************

2006-10-20 19:17:20

by Russell King

Subject: Re: [PATCH] arm: switch to new pci_get_bus_and_slot API

On Mon, Oct 16, 2006 at 04:49:50PM +0100, Alan Cox wrote:
> Signed-off-by: Alan Cox <[email protected]>

Applied a while back, but just discovered these in the ARM kautobuild
logs...

> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c
> --- linux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c 2006-10-13 15:06:14.000000000 +0100
> +++ linux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.c 2006-10-13 17:14:23.000000000 +0100
> @@ -133,11 +133,13 @@
> struct pci_dev *dev;
>
> if (ixdp2x00_master_npu()) {
> - dev = pci_find_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
> + dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
> pci_remove_bus_device(dev);
> + pci_dev_put(dev)

Missing ;

> } else {
> - dev = pci_find_slot(1, IXDP2400_MASTER_ENET_DEVFN);
> + dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN);
> pci_remove_bus_device(dev);
> + pci_dev_put(dev)

Missing ;

Now fixed in my tree.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core