Merge branch 'pci/bjorn-p2p-bridge-windows' into next

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

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index eb0293e23e48010979c645e3e5acd3355c55bbe1..fdb11770af1ff69b277c20f5307f037673a65060 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -265,7 +265,7 @@ out:
  * assign_requested_resources_sorted() - satisfy resource requests
  *
  * @head : head of the list tracking requests for resources
- * @failed_list : head of the list tracking requests that could
+ * @fail_head : head of the list tracking requests that could
  *             not be allocated
  *
  * Satisfy resource requests of each element in the list. Add
@@ -404,8 +404,8 @@ void pci_setup_cardbus(struct pci_bus *bus)
        struct resource *res;
        struct pci_bus_region region;
 
-       dev_info(&bridge->dev, "CardBus bridge to [bus %02x-%02x]\n",
-                bus->secondary, bus->subordinate);
+       dev_info(&bridge->dev, "CardBus bridge to %pR\n",
+                &bus->busn_res);
 
        res = bus->resource[0];
        pcibios_resource_to_bus(bridge, &region, res);
@@ -560,8 +560,8 @@ static void __pci_setup_bridge(struct pci_bus *bus, unsigned long type)
 {
        struct pci_dev *bridge = bus->self;
 
-       dev_info(&bridge->dev, "PCI bridge to [bus %02x-%02x]\n",
-                bus->secondary, bus->subordinate);
+       dev_info(&bridge->dev, "PCI bridge to %pR\n",
+                &bus->busn_res);
 
        if (type & IORESOURCE_IO)
                pci_setup_bridge_io(bus);
@@ -767,8 +767,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
        if (!size0 && !size1) {
                if (b_res->start || b_res->end)
                        dev_info(&bus->self->dev, "disabling bridge window "
-                                "%pR to [bus %02x-%02x] (unused)\n", b_res,
-                                bus->secondary, bus->subordinate);
+                                "%pR to %pR (unused)\n", b_res,
+                                &bus->busn_res);
                b_res->flags = 0;
                return;
        }
@@ -780,8 +780,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
                add_to_list(realloc_head, bus->self, b_res, size1-size0,
                            min_align);
                dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window "
-                                "%pR to [bus %02x-%02x] add_size %lx\n", b_res,
-                                bus->secondary, bus->subordinate, size1-size0);
+                                "%pR to %pR add_size %lx\n", b_res,
+                                &bus->busn_res, size1-size0);
        }
 }
 
@@ -886,8 +886,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
        if (!size0 && !size1) {
                if (b_res->start || b_res->end)
                        dev_info(&bus->self->dev, "disabling bridge window "
-                                "%pR to [bus %02x-%02x] (unused)\n", b_res,
-                                bus->secondary, bus->subordinate);
+                                "%pR to %pR (unused)\n", b_res,
+                                &bus->busn_res);
                b_res->flags = 0;
                return 1;
        }
@@ -897,8 +897,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
        if (size1 > size0 && realloc_head) {
                add_to_list(realloc_head, bus->self, b_res, size1-size0, min_align);
                dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window "
-                                "%pR to [bus %02x-%02x] add_size %llx\n", b_res,
-                                bus->secondary, bus->subordinate, (unsigned long long)size1-size0);
+                                "%pR to %pR add_size %llx\n", b_res,
+                                &bus->busn_res, (unsigned long long)size1-size0);
        }
        return 1;
 }