Commit bae8dd4d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] PCI: remove usage of pci_for_each_dev() in arch/ppc/kernel/pci.c

parent 948c08f9
...@@ -548,12 +548,12 @@ static inline void alloc_resource(struct pci_dev *dev, int idx) ...@@ -548,12 +548,12 @@ static inline void alloc_resource(struct pci_dev *dev, int idx)
static void __init static void __init
pcibios_allocate_resources(int pass) pcibios_allocate_resources(int pass)
{ {
struct pci_dev *dev; struct pci_dev *dev = NULL;
int idx, disabled; int idx, disabled;
u16 command; u16 command;
struct resource *r; struct resource *r;
pci_for_each_dev(dev) { while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
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];
...@@ -586,11 +586,11 @@ pcibios_allocate_resources(int pass) ...@@ -586,11 +586,11 @@ pcibios_allocate_resources(int pass)
static void __init static void __init
pcibios_assign_resources(void) pcibios_assign_resources(void)
{ {
struct pci_dev *dev; struct pci_dev *dev = NULL;
int idx; int idx;
struct resource *r; struct resource *r;
pci_for_each_dev(dev) { while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
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 */
...@@ -881,7 +881,7 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn) ...@@ -881,7 +881,7 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn)
{ {
unsigned int *reg; unsigned int *reg;
struct pci_controller* hose; struct pci_controller* hose;
struct pci_dev* dev; struct pci_dev* dev = NULL;
if (!have_of) if (!have_of)
return -ENODEV; return -ENODEV;
...@@ -905,7 +905,7 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn) ...@@ -905,7 +905,7 @@ 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;
pci_for_each_dev(dev) { while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
if (pci_to_OF_bus_map[dev->bus->number] != *bus) if (pci_to_OF_bus_map[dev->bus->number] != *bus)
continue; continue;
if (dev->devfn != *devfn) if (dev->devfn != *devfn)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment