PCIE: aer: use dev_printk when possible

Convert printks to use dev_printk().

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

3 files changed, 19 insertions, 21 deletions

diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index b7a3aa602d40..77036f46acfe 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -220,8 +220,7 @@ static int __devinit aer_probe (struct pcie_device *dev,
 
         /* Alloc rpc data structure */
         if (!(rpc = aer_alloc_rpc(dev))) {
-                printk(KERN_DEBUG "%s: Alloc rpc fails on PCIE device[%s]\n",
-                        __func__, device->bus_id);
+                dev_printk(KERN_DEBUG, device, "alloc rpc failed\n");
                 aer_remove(dev);
                 return -ENOMEM;
         }
@@ -229,8 +228,7 @@ static int __devinit aer_probe (struct pcie_device *dev,
         /* Request IRQ ISR */
         if ((status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv",
                                 dev))) {
-                printk(KERN_DEBUG "%s: Request ISR fails on PCIE device[%s]\n",
-                        __func__, device->bus_id);
+                dev_printk(KERN_DEBUG, device, "request IRQ failed\n");
                 aer_remove(dev);
                 return status;
         }
@@ -274,7 +272,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)
          * to issue Configuration Requests to those devices.
          */
         msleep(200);
-        printk(KERN_DEBUG "Complete link reset at Root[%s]\n", dev->dev.bus_id);
+        dev_printk(KERN_DEBUG, &dev->dev, "Root Port link has been reset\n");
 
         /* Enable Root Port's interrupt in response to error messages */
         pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, &status);
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index d39a78dbd026..30f581b8791f 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -50,10 +50,10 @@ int aer_osc_setup(struct pcie_device *pciedev)
         }
 
         if (ACPI_FAILURE(status)) {
-                printk(KERN_DEBUG "AER service couldn't init device %s - %s\n",
-                    pciedev->device.bus_id,
-                    (status == AE_SUPPORT || status == AE_NOT_FOUND) ?
-                    "no _OSC support" : "Run ACPI _OSC fails");
+                dev_printk(KERN_DEBUG, &pciedev->device, "AER service couldn't "
+                           "init device: %s\n",
+                           (status == AE_SUPPORT || status == AE_NOT_FOUND) ?
+                           "no _OSC support" : "_OSC failed");
                 return -1;
         }
 
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index aaa82392d1dc..ee5e7b5176d0 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -221,9 +221,9 @@ static void report_error_detected(struct pci_dev *dev, void *data)
                          * of a driver for this device is unaware of
                          * its hw state.
                          */
-                        printk(KERN_DEBUG "Device ID[%s] has %s\n",
-                                        dev->dev.bus_id, (dev->driver) ?
-                                        "no AER-aware driver" : "no driver");
+                        dev_printk(KERN_DEBUG, &dev->dev, "device has %s\n",
+                                   dev->driver ?
+                                   "no AER-aware driver" : "no driver");
                 }
                 return;
         }
@@ -304,7 +304,7 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,
 {
         struct aer_broadcast_data result_data;
 
-        printk(KERN_DEBUG "Broadcast %s message\n", error_mesg);
+        dev_printk(KERN_DEBUG, &dev->dev, "broadcast %s message\n", error_mesg);
         result_data.state = state;
         if (cb == report_error_detected)
                 result_data.result = PCI_ERS_RESULT_CAN_RECOVER;
@@ -404,18 +404,16 @@ static pci_ers_result_t reset_link(struct pcie_device *aerdev,
                         data.aer_driver =
                                 to_service_driver(aerdev->device.driver);
                 } else {
-                        printk(KERN_DEBUG "No link-reset support to Device ID"
-                                "[%s]\n",
-                                dev->dev.bus_id);
+                        dev_printk(KERN_DEBUG, &dev->dev, "no link-reset "
+                                   "support\n");
                         return PCI_ERS_RESULT_DISCONNECT;
                 }
         }
 
         status = data.aer_driver->reset_link(udev);
         if (status != PCI_ERS_RESULT_RECOVERED) {
-                printk(KERN_DEBUG "Link reset at upstream Device ID"
-                        "[%s] failed\n",
-                        udev->dev.bus_id);
+                dev_printk(KERN_DEBUG, &dev->dev, "link reset at upstream "
+                           "device %s failed\n", pci_name(udev));
                 return PCI_ERS_RESULT_DISCONNECT;
         }
 
@@ -511,10 +509,12 @@ static void handle_error_source(struct pcie_device * aerdev,
         } else {
                 status = do_recovery(aerdev, dev, info.severity);
                 if (status == PCI_ERS_RESULT_RECOVERED) {
-                        printk(KERN_DEBUG "AER driver successfully recovered\n");
+                        dev_printk(KERN_DEBUG, &dev->dev, "AER driver "
+                                   "successfully recovered\n");
                 } else {
                         /* TODO: Should kernel panic here? */
-                        printk(KERN_DEBUG "AER driver didn't recover\n");
+                        dev_printk(KERN_DEBUG, &dev->dev, "AER driver didn't "
+                                   "recover\n");
                 }
         }
 }