Merge branch 'next/cleanup2' into HEAD

[cascardo/linux.git] / drivers / parisc / lba_pci.c

diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 4f9cf24..fdd63a6 100644 (file)
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -629,7 +629,7 @@ truncate_pat_collision(struct resource *root, struct resource *new)
 static void
 lba_fixup_bus(struct pci_bus *bus)
 {
-       struct list_head *ln;
+       struct pci_dev *dev;
 #ifdef FBB_SUPPORT
        u16 status;
 #endif
@@ -710,9 +710,8 @@ lba_fixup_bus(struct pci_bus *bus)
 
        }
 
-       list_for_each(ln, &bus->devices) {
+       list_for_each_entry(dev, &bus->devices, bus_list) {
                int i;
-               struct pci_dev *dev = pci_dev_b(ln);
 
                DBG("lba_fixup_bus() %s\n", pci_name(dev));
 
@@ -770,7 +769,7 @@ lba_fixup_bus(struct pci_bus *bus)
        }
 
        /* Lastly enable FBB/PERR/SERR on all devices too */
-       list_for_each(ln, &bus->devices) {
+       list_for_each_entry(dev, &bus->devices, bus_list) {
                (void) pci_read_config_word(dev, PCI_COMMAND, &status);
                status |= PCI_COMMAND_PARITY | PCI_COMMAND_SERR | fbb_enable;
                (void) pci_write_config_word(dev, PCI_COMMAND, status);