PCI: improve discovery/configuration messages

[net-next-2.6.git] / arch / x86 / pci / i386.c

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index d49d17de7b3fe628af866f11c8e6d8518718864d..b73c09f4521004c0eca41ccfbae48a4a26223ead 100644 (file)
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -129,7 +129,9 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                        continue;
                                if (!r->start ||
                                    pci_claim_resource(dev, idx) < 0) {
-                                       dev_info(&dev->dev, "BAR %d: can't allocate %pR\n", idx, r);
+                                       dev_info(&dev->dev,
+                                                "can't reserve window %pR\n",
+                                                r);
                                        /*
                                         * Something is wrong with the region.
                                         * Invalidate the resource to prevent
@@ -165,10 +167,11 @@ static void __init pcibios_allocate_resources(int pass)
                                disabled = !(command & PCI_COMMAND_MEMORY);
                        if (pass == disabled) {
                                dev_dbg(&dev->dev,
-                                       "BAR %d: claiming %pr (d=%d, p=%d)\n",
+                                       "BAR %d: reserving %pr (d=%d, p=%d)\n",
                                        idx, r, disabled, pass);
                                if (pci_claim_resource(dev, idx) < 0) {
-                                       dev_info(&dev->dev, "BAR %d: can't claim %pR\n", idx, r);
+                                       dev_info(&dev->dev,
+                                                "can't reserve %pR\n", r);
                                        /* We'll assign a new address later */
                                        r->end -= r->start;
                                        r->start = 0;