arch/ remove pci_find_{device, subsys}
Subsystems (2)
PATCH 18/18 arch/ remove pci_find_{device, subsys}
Remove deprecated pci_find_device and pci_find_subsys
Do consider applying.
Signed-off-by Amit Gud <[email protected]>
arch/alpha/kernel/sys_alcor.c +1 -1
@@ -254,7 +254,7 @@ alcor_init_pci(void)* motherboard, by looking for a 21040 TULIP in slot 6, which is * built into XLT and BRET/MAVERICK, but not available on ALCOR. */ - dev =pci_find_device (PCI_VENDOR_ID_DEC , + dev =pci_get_device (PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_TULIP ,NULL );if (dev && dev->devfn ==PCI_DEVFN (6 ,0 )) {
arch/alpha/kernel/sys_sio.c +2 -2
@@ -105,7 +105,7 @@ sio_collect_irq_levels(void)struct pci_dev *dev =NULL ;/* Iterate through the devices, collecting IRQ levels. */ -while ((dev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) { +while ((dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) {if ((dev->class >>16 ==PCI_BASE_CLASS_BRIDGE ) && (dev->class >>8 !=PCI_CLASS_BRIDGE_PCMCIA ))continue ;
@@ -229,7 +229,7 @@ alphabook1_init_pci(void)*/ dev =NULL ; -while ((dev =pci_find_device (PCI_VENDOR_ID_NCR ,PCI_ANY_ID , dev))) { +while ((dev =pci_get_device (PCI_VENDOR_ID_NCR ,PCI_ANY_ID , dev))) {if (dev->device ==PCI_DEVICE_ID_NCR_53C810 || dev->device ==PCI_DEVICE_ID_NCR_53C815 || dev->device == PCI_DEVICE_ID_NCR_53C820
arch/frv/mb93090-mb00/pci-frv.c +2 -2
@@ -142,7 +142,7 @@ static void __init pcibios_allocate_resou16 command;struct resource *r, *pr; -while (dev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , dev), +while (dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev), dev !=NULL ) {pci_read_config_word (dev,PCI_COMMAND , &command);
@@ -188,7 +188,7 @@ static void __init pcibios_assign_resourint idx;struct resource *r; -while (dev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , dev), +while (dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev), dev !=NULL ) {int class = dev->class >>8 ;
arch/frv/mb93090-mb00/pci-irq.c +1 -1
@@ -48,7 +48,7 @@ void __init pcibios_fixup_irqs(void)struct pci_dev *dev =NULL ;uint8_t line, pin; -while (dev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , dev), +while (dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev), dev !=NULL ) {pci_read_config_byte (dev,PCI_INTERRUPT_PIN , &pin);
arch/ia64/sn/kernel/io_init.c +1 -1
@@ -365,7 +365,7 @@ static int __init sn_pci_init(void)*/ while ((pci_dev = -pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , pci_dev)) !=NULL ) { +pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , pci_dev)) !=NULL ) {sn_pci_fixup_slot (pci_dev); }
arch/ppc/kernel/pci.c +3 -3
@@ -503,7 +503,7 @@ pcibios_allocate_resources(int pass)u16 command;struct resource *r; -while ((dev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) { +while ((dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) {pci_read_config_word (dev,PCI_COMMAND , &command);for (idx =0 ; idx <6 ; idx++) { r = &dev->resource[idx];
@@ -540,7 +540,7 @@ pcibios_assign_resources(void)int idx;struct resource *r; -while ((dev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) { +while ((dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) {int class = dev->class >>8 ;/* Don't touch classless devices and host bridges */
@@ -866,7 +866,7 @@ pci_device_from_OF_node(struct device_no*/ if (!pci_to_OF_bus_map)return 0 ; -while ((dev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) { +while ((dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) {if (pci_to_OF_bus_map[dev->bus->number] != *bus)continue ;if (dev->devfn != *devfn)
arch/ppc/platforms/chestnut.c +1 -1
@@ -486,7 +486,7 @@ set_pci_command_invalidate(void)struct pci_dev *dev =NULL ;u16 val; -while ((dev =pci_find_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) { +while ((dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) {pci_read_config_word (dev,PCI_COMMAND , &val); val |=PCI_COMMAND_INVALIDATE ;pci_write_config_word (dev,PCI_COMMAND , val);
arch/sparc64/kernel/ebus.c +1 -1
@@ -528,7 +528,7 @@ static struct pci_dev *find_next_ebus(ststruct pci_dev *pdev = start; do { - pdev = pci_find_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev); + pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev); if (pdev && (pdev->device == PCI_DEVICE_ID_SUN_EBUS || pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS))
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
Quoted 10 lines · Amit Gud
Remove deprecated
pci_find_deviceandpci_find_subsysDo consider applying.
Signed-off-by Amit Gud <[email protected]>diff -uprN
orig/arch/alpha/kernel/sys_alcor.clinux-2.6.11-rc3/arch/alpha/kernel/sys_alcor.c
arch/alpha/kernel/sys_alcor.c alcor_init_pci(void) · line 260
Quoted 8 lines
arch/alpha/kernel/sys_alcor.c +1
-1@@ -254,7 +254,7 @@ alcor_init_pci(void)* motherboard, by looking for a 21040 TULIP in slot 6, which is * built into XLT and BRET/MAVERICK, but not available on ALCOR. */ - dev =pci_find_device (PCI_VENDOR_ID_DEC , + dev =pci_get_device (PCI_VENDOR_ID_DEC ,PCI_DEVICE_ID_DEC_TULIP ,NULL );if (dev && dev->devfn ==PCI_DEVFN (6 ,0 )) {
Nope, incorrect usage, please do not apply.
greg k-h
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors