commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / arch / i386 / pci / i386.c

diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index 6b3d6ba..2ebc7c6 100644 (file)
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -112,7 +112,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                        continue;
                                pr = pci_find_parent_resource(dev, r);
                                if (!pr || request_resource(pr, r) < 0)
-                                       printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, dev->slot_name);
+                                       printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev));
                        }
                }
                pcibios_allocate_bus_resources(&bus->children);
@@ -143,7 +143,7 @@ static void __init pcibios_allocate_resources(int pass)
                                    r->start, r->end, r->flags, disabled, pass);
                                pr = pci_find_parent_resource(dev, r);
                                if (!pr || request_resource(pr, r) < 0) {
-                                       printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, dev->slot_name);
+                                       printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, pci_name(dev));
                                        /* We'll assign a new address later */
                                        r->end -= r->start;
                                        r->start = 0;
@@ -155,7 +155,7 @@ static void __init pcibios_allocate_resources(int pass)
                        if (r->flags & PCI_ROM_ADDRESS_ENABLE) {
                                /* Turn the ROM off, leave the resource region, but keep it unregistered. */
                                u32 reg;
-                               DBG("PCI: Switching off ROM of %s\n", dev->slot_name);
+                               DBG("PCI: Switching off ROM of %s\n", pci_name(dev));
                                r->flags &= ~PCI_ROM_ADDRESS_ENABLE;
                                pci_read_config_dword(dev, dev->rom_base_reg, &reg);
                                pci_write_config_dword(dev, dev->rom_base_reg, reg & ~PCI_ROM_ADDRESS_ENABLE);
@@ -230,7 +230,7 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
 
                r = &dev->resource[idx];
                if (!r->start && r->end) {
-                       printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name);
+                       printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
                        return -EINVAL;
                }
                if (r->flags & IORESOURCE_IO)
@@ -241,7 +241,7 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
        if (dev->resource[PCI_ROM_RESOURCE].start)
                cmd |= PCI_COMMAND_MEMORY;
        if (cmd != old_cmd) {
-               printk("PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd);
+               printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
                pci_write_config_word(dev, PCI_COMMAND, cmd);
        }
        return 0;
@@ -263,7 +263,7 @@ void pcibios_set_master(struct pci_dev *dev)
                lat = pcibios_max_latency;
        else
                return;
-       printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n", dev->slot_name, lat);
+       printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat);
        pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 }