lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] PCI: pci_find_device remove (ppc/kernel/pci.c)

Browse Source 
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>
 arch/ppc/kernel/pci.c |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
This commit is contained in:
Jiri Slaby
2005-11-06 23:39:34 -08:00
committed by Greg Kroah-Hartman
parent 94517252b7
commit cee0295381
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/ppc/kernel/pci.c
View File

@@ -503,7 +503,7 @@ pcibios_allocate_resources(int pass)
u16 command; u16 command;
struct resource *r; 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); pci_read_config_word(dev, PCI_COMMAND, &command);
for (idx = 0; idx < 6; idx++) { for (idx = 0; idx < 6; idx++) {
r = &dev->resource[idx]; r = &dev->resource[idx];
@@ -540,7 +540,7 @@ pcibios_assign_resources(void)
int idx; int idx;
struct resource *r; 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; int class = dev->class >> 8;
/* Don't touch classless devices and host bridges */ /* Don't touch classless devices and host bridges */
@@ -867,14 +867,15 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn)
*/ */
if (!pci_to_OF_bus_map) if (!pci_to_OF_bus_map)
return 0; 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) for_each_pci_dev(dev)
continue; if (pci_to_OF_bus_map[dev->bus->number] == *bus &&
if (dev->devfn != *devfn) dev->devfn == *devfn) {
continue; *bus = dev->bus->number;
*bus = dev->bus->number; pci_dev_put(dev);
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
} }
EXPORT_SYMBOL(pci_device_from_OF_node); EXPORT_SYMBOL(pci_device_from_OF_node);