PCI/PM: Use PCI dev_printk() wrappers for consistency
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 7 Oct 2019 12:55:18 +0000 (07:55 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 20 Nov 2019 23:34:06 +0000 (17:34 -0600)
Use the PCI dev_printk() wrappers for consistency with the rest of the PCI
core.  No functional change intended.

Link: https://lore.kernel.org/r/20191017212851.54237-2-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/pci/pci-driver.c

index dd70ab2..407b1df 100644 (file)
@@ -315,7 +315,8 @@ static long local_pci_probe(void *_ddi)
         * Probe function should return < 0 for failure, 0 for success
         * Treat values > 0 as success, but warn.
         */
-       dev_warn(dev, "Driver probe function unexpectedly returned %d\n", rc);
+       pci_warn(pci_dev, "Driver probe function unexpectedly returned %d\n",
+                rc);
        return 0;
 }
 
@@ -865,7 +866,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
                        pci_prepare_to_sleep(pci_dev);
        }
 
-       dev_dbg(dev, "PCI PM: Suspend power state: %s\n",
+       pci_dbg(pci_dev, "PCI PM: Suspend power state: %s\n",
                pci_power_name(pci_dev->current_state));
 
        if (pci_dev->current_state == PCI_D0) {
@@ -880,7 +881,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
        }
 
        if (pci_dev->skip_bus_pm && pm_suspend_no_platform()) {
-               dev_dbg(dev, "PCI PM: Skipped\n");
+               pci_dbg(pci_dev, "PCI PM: Skipped\n");
                goto Fixup;
        }
 
@@ -1295,11 +1296,11 @@ static int pci_pm_runtime_suspend(struct device *dev)
                 * log level.
                 */
                if (error == -EBUSY || error == -EAGAIN) {
-                       dev_dbg(dev, "can't suspend now (%ps returned %d)\n",
+                       pci_dbg(pci_dev, "can't suspend now (%ps returned %d)\n",
                                pm->runtime_suspend, error);
                        return error;
                } else if (error) {
-                       dev_err(dev, "can't suspend (%ps returned %d)\n",
+                       pci_err(pci_dev, "can't suspend (%ps returned %d)\n",
                                pm->runtime_suspend, error);
                        return error;
                }