[PATCH] PCI: arch/i386/pci/legacy.c: use raw_pci_ops

Make pcibios_fixup_peer_bridges() use raw_pci_ops directly instead of
faking pci_bus and pci_dev.

diff --git a/arch/i386/pci/legacy.c b/arch/i386/pci/legacy.c
index 71ca3133cdebd58cdc232ed3714c09d71c2ce884..c72bf1a59b7e5ec103c1ac935c705925ad615b16 100644 (file)
--- a/arch/i386/pci/legacy.c
+++ b/arch/i386/pci/legacy.c
@@ -11,40 +11,26 @@
  */
 static void __devinit pcibios_fixup_peer_bridges(void)
 {
-       int n;
-       struct pci_bus *bus;
-       struct pci_dev *dev;
-       u16 l;
+       int n, devfn;
 
        if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff)
                return;
        DBG("PCI: Peer bridge fixup\n");
 
-       bus = kmalloc(sizeof(*bus), GFP_ATOMIC);
-       dev = kmalloc(sizeof(*dev), GFP_ATOMIC);
-       if (!bus || !dev) {
-               printk(KERN_ERR "Out of memory in %s\n", __FUNCTION__);
-               goto exit;
-       }
-
        for (n=0; n <= pcibios_last_bus; n++) {
+               u32 l;
                if (pci_find_bus(0, n))
                        continue;
-               bus->number = n;
-               bus->ops = &pci_root_ops;
-               dev->bus = bus;
-               for (dev->devfn=0; dev->devfn<256; dev->devfn += 8)
-                       if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) &&
+               for (devfn = 0; devfn < 256; devfn += 8) {
+                       if (!raw_pci_ops->read(0, n, devfn, PCI_VENDOR_ID, 2, &l) &&
                            l != 0x0000 && l != 0xffff) {
                                DBG("Found device at %02x:%02x [%04x]\n", n, dev->devfn, l);
                                printk(KERN_INFO "PCI: Discovered peer bus %02x\n", n);
                                pci_scan_bus(n, &pci_root_ops, NULL);
                                break;
                        }
+               }
        }
-exit:
-       kfree(dev);
-       kfree(bus);
 }
 
 static int __init pci_legacy_init(void)