1 files changed, 22 insertions, 16 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 3706ce7972dd..b1724cf31b66 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -277,8 +277,8 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
                         res->end = res->start + sz64;
 #else
                         if (sz64 > 0x100000000ULL) {
-                                printk(KERN_ERR "PCI: Unable to handle 64-bit "
-                                        "BAR for device %s\n", pci_name(dev));
+                                dev_err(&dev->dev, "BAR %d: can't handle 64-bit"
+                                        " BAR\n", pos);
                                 res->start = 0;
                                 res->flags = 0;
                         } else if (lhi) {
@@ -329,7 +329,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                 return;
 
         if (dev->transparent) {
-                printk(KERN_INFO "PCI: Transparent bridge - %s\n", pci_name(dev));
+                dev_info(&dev->dev, "transparent bridge\n");
                 for(i = 3; i < PCI_BUS_NUM_RESOURCES; i++)
                         child->resource[i] = child->parent->resource[i - 3];
         }
@@ -392,7 +392,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
                         limit |= ((long) mem_limit_hi) << 32;
 #else
                         if (mem_base_hi || mem_limit_hi) {
-                                printk(KERN_ERR "PCI: Unable to handle 64-bit address space for bridge %s\n", pci_name(dev));
+                                dev_err(&dev->dev, "can't handle 64-bit "
+                                        "address space for bridge\n");
                                 return;
                         }
 #endif
@@ -414,6 +415,7 @@ static struct pci_bus * pci_alloc_bus(void)
                 INIT_LIST_HEAD(&b->node);
                 INIT_LIST_HEAD(&b->children);
                 INIT_LIST_HEAD(&b->devices);
+                INIT_LIST_HEAD(&b->slots);
         }
         return b;
 }
@@ -511,8 +513,8 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
 
         pci_read_config_dword(dev, PCI_PRIMARY_BUS, &buses);
 
-        pr_debug("PCI: Scanning behind PCI bridge %s, config %06x, pass %d\n",
-                 pci_name(dev), buses & 0xffffff, pass);
+        dev_dbg(&dev->dev, "scanning behind bridge, config %06x, pass %d\n",
+                buses & 0xffffff, pass);
 
         /* Disable MasterAbortMode during probing to avoid reporting
            of bus errors (in some architectures) */ 
@@ -535,8 +537,8 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
                  * ignore it.  This can happen with the i450NX chipset.
                  */
                 if (pci_find_bus(pci_domain_nr(bus), busnr)) {
-                        printk(KERN_INFO "PCI: Bus %04x:%02x already known\n",
-                                        pci_domain_nr(bus), busnr);
+                        dev_info(&dev->dev, "bus %04x:%02x already known\n",
+                                 pci_domain_nr(bus), busnr);
                         goto out;
                 }
 
@@ -711,8 +713,9 @@ static int pci_setup_device(struct pci_dev * dev)
 {
         u32 class;
 
-        sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
-                dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+        dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
+                     dev->bus->number, PCI_SLOT(dev->devfn),
+                     PCI_FUNC(dev->devfn));
 
         pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
         dev->revision = class & 0xff;
@@ -720,7 +723,7 @@ static int pci_setup_device(struct pci_dev * dev)
         dev->class = class;
         class >>= 8;
 
-        pr_debug("PCI: Found %s [%04x/%04x] %06x %02x\n", pci_name(dev),
+        dev_dbg(&dev->dev, "found [%04x/%04x] class %06x header type %02x\n",
                  dev->vendor, dev->device, class, dev->hdr_type);
 
         /* "Unknown power state" */
@@ -788,13 +791,13 @@ static int pci_setup_device(struct pci_dev * dev)
                 break;
 
         default:                                    /* unknown header */
-                printk(KERN_ERR "PCI: device %s has unknown header type %02x, ignoring.\n",
-                        pci_name(dev), dev->hdr_type);
+                dev_err(&dev->dev, "unknown header type %02x, "
+                        "ignoring device\n", dev->hdr_type);
                 return -1;
 
         bad:
-                printk(KERN_ERR "PCI: %s: class %x doesn't match header type %02x. Ignoring class.\n",
-                       pci_name(dev), class, dev->hdr_type);
+                dev_err(&dev->dev, "ignoring class %02x (doesn't match header "
+                        "type %02x)\n", class, dev->hdr_type);
                 dev->class = PCI_CLASS_NOT_DEFINED;
         }
 
@@ -927,7 +930,7 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
                         return NULL;
                 /* Card hasn't responded in 60 seconds?  Must be stuck. */
                 if (delay > 60 * 1000) {
-                        printk(KERN_WARNING "Device %04x:%02x:%02x.%d not "
+                        printk(KERN_WARNING "pci %04x:%02x:%02x.%d: not "
                                         "responding\n", pci_domain_nr(bus),
                                         bus->number, PCI_SLOT(devfn),
                                         PCI_FUNC(devfn));
@@ -984,6 +987,9 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
         /* Fix up broken headers */
         pci_fixup_device(pci_fixup_header, dev);
 
+        /* Initialize power management of the device */
+        pci_pm_init(dev);
+
         /*
          * Add the device to our list of discovered devices
          * and the bus list for fixup functions, etc.