diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2005-11-07 02:39:32 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-09 15:13:14 -0500 |
commit | 7d51ceb34c7991633c36a5bab3066927ac7c661c (patch) | |
tree | ff8f30b04e6628459e6467a8b1603796a6b2595e /arch/alpha | |
parent | 3efd273b4d52f0d3ae5ce61b2161cb3752f360a0 (diff) |
[PATCH] PCI: pci_find_device remove (alpha/kernel/sys_sio.c)
Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/kernel/sys_sio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c index 47df48a6ddb7..131a2d9f79d3 100644 --- a/arch/alpha/kernel/sys_sio.c +++ b/arch/alpha/kernel/sys_sio.c | |||
@@ -105,7 +105,7 @@ sio_collect_irq_levels(void) | |||
105 | struct pci_dev *dev = NULL; | 105 | struct pci_dev *dev = NULL; |
106 | 106 | ||
107 | /* Iterate through the devices, collecting IRQ levels. */ | 107 | /* Iterate through the devices, collecting IRQ levels. */ |
108 | while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { | 108 | for_each_pci_dev(dev) { |
109 | if ((dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) && | 109 | if ((dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) && |
110 | (dev->class >> 8 != PCI_CLASS_BRIDGE_PCMCIA)) | 110 | (dev->class >> 8 != PCI_CLASS_BRIDGE_PCMCIA)) |
111 | continue; | 111 | continue; |
@@ -229,8 +229,8 @@ alphabook1_init_pci(void) | |||
229 | */ | 229 | */ |
230 | 230 | ||
231 | dev = NULL; | 231 | dev = NULL; |
232 | while ((dev = pci_find_device(PCI_VENDOR_ID_NCR, PCI_ANY_ID, dev))) { | 232 | while ((dev = pci_get_device(PCI_VENDOR_ID_NCR, PCI_ANY_ID, dev))) { |
233 | if (dev->device == PCI_DEVICE_ID_NCR_53C810 | 233 | if (dev->device == PCI_DEVICE_ID_NCR_53C810 |
234 | || dev->device == PCI_DEVICE_ID_NCR_53C815 | 234 | || dev->device == PCI_DEVICE_ID_NCR_53C815 |
235 | || dev->device == PCI_DEVICE_ID_NCR_53C820 | 235 | || dev->device == PCI_DEVICE_ID_NCR_53C820 |
236 | || dev->device == PCI_DEVICE_ID_NCR_53C825) { | 236 | || dev->device == PCI_DEVICE_ID_NCR_53C825) { |