arm: switch to new pci_get_bus_and_slot API
Subsystems (2)
PATCH 1/1 arm: switch to new pci_get_bus_and_slot API
Signed-off-by Alan Cox <[email protected]>
arch/arm/mach-ixp2000/ixdp2400.c +4 -2
@@ -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 (); }
arch/arm/mach-ixp2000/ixdp2800.c +4 -2
@@ -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); } }
arch/arm/mach-ixp2000/ixdp2x00.c +5 -2
@@ -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); }/**************************************************************************
Quoted 1 line · Alan Cox
Signed-off-by Alan Cox <[email protected]>
Applied a while back, but just discovered these in the ARM kautobuild logs...
arch/arm/mach-ixp2000/ixdp2400.c line 138
Quoted 11 lines
diff -u --new-file --recursive --exclude-from
/usr/src/excludelinux.vanilla-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.clinux-2.6.19-rc1-mm1/arch/arm/mach-ixp2000/ixdp2400.carch/arm/mach-ixp2000/ixdp2400.c +2
-1@@ -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 ;
arch/arm/mach-ixp2000/ixdp2400.c line 142
Quoted 5 lines
arch/arm/mach-ixp2000/ixdp2400.c +2
-1}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.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core