From: Jiri Slaby Signed-off-by: Jiri Slaby Cc: Greg KH Signed-off-by: Andrew Morton --- arch/ppc/kernel/pci.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff -puN arch/ppc/kernel/pci.c~arch-pci_find_device-remove-ppc-kernel-pcic arch/ppc/kernel/pci.c --- devel/arch/ppc/kernel/pci.c~arch-pci_find_device-remove-ppc-kernel-pcic 2005-09-09 23:04:49.000000000 -0700 +++ devel-akpm/arch/ppc/kernel/pci.c 2005-09-09 23:04:49.000000000 -0700 @@ -517,7 +517,7 @@ pcibios_allocate_resources(int pass) u16 command; struct resource *r; - while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { + for_each_pci_dev(dev) { pci_read_config_word(dev, PCI_COMMAND, &command); for (idx = 0; idx < 6; idx++) { r = &dev->resource[idx]; @@ -554,7 +554,7 @@ pcibios_assign_resources(void) int idx; struct resource *r; - while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { + for_each_pci_dev(dev) { int class = dev->class >> 8; /* Don't touch classless devices and host bridges */ @@ -880,14 +880,15 @@ 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) { - if (pci_to_OF_bus_map[dev->bus->number] != *bus) - continue; - if (dev->devfn != *devfn) - continue; - *bus = dev->bus->number; - return 0; - } + + for_each_pci_dev(dev) + if (pci_to_OF_bus_map[dev->bus->number] == *bus && + dev->devfn == *devfn) { + *bus = dev->bus->number; + pci_dev_put(dev); + return 0; + } + return -ENODEV; } _