memory_accessor: implement the new memory_accessor interfaces for SPI EEPROMs

[linux-2.6-omap-h63xx.git] / drivers / pci / setup-bus.c

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index ea979f2bc6db0ecdc6f6c355e9926c59f908cfd7..334285a8e23760f7b36eda595e9ef7aa0da0ecf4 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -27,7 +27,7 @@
 #include <linux/slab.h>
 
 
-static void pbus_assign_resources_sorted(struct pci_bus *bus)
+static void pbus_assign_resources_sorted(const struct pci_bus *bus)
 {
        struct pci_dev *dev;
        struct resource *res;
@@ -144,6 +144,9 @@ static void pci_setup_bridge(struct pci_bus *bus)
        struct pci_bus_region region;
        u32 l, bu, lu, io_upper16;
 
+       if (!pci_is_root_bus(bus) && bus->is_added)
+               return;
+
        dev_info(&bridge->dev, "PCI bridge, secondary bus %04x:%02x\n",
                 pci_domain_nr(bus), bus->number);
 
@@ -495,7 +498,7 @@ void __ref pci_bus_size_bridges(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pci_bus_size_bridges);
 
-void __ref pci_bus_assign_resources(struct pci_bus *bus)
+void __ref pci_bus_assign_resources(const struct pci_bus *bus)
 {
        struct pci_bus *b;
        struct pci_dev *dev;
@@ -536,9 +539,8 @@ static void pci_bus_dump_res(struct pci_bus *bus)
                 if (!res)
                         continue;
 
-               printk(KERN_INFO "bus: %02x index %x %s: %pR\n",
-                      bus->number, i,
-                      (res->flags & IORESOURCE_IO) ? "io port" : "mmio", res);
+               dev_printk(KERN_DEBUG, &bus->dev, "resource %d %s %pR\n", i,
+                          (res->flags & IORESOURCE_IO) ? "io: " : "mem:", res);
         }
 }