PCI: pciehp: Log messages with pci_dev, not pcie_device

Log messages with pci_dev, not pcie_device.  Factor out common message
prefixes with dev_fmt().

Example output change:

  - pciehp 0000:00:06.0:pcie004: Slot(0) Powering on due to button press
  + pcieport 0000:00:06.0: pciehp: Slot(0) Powering on due to button press

Link: https://lore.kernel.org/lkml/20190509141456.223614-8-helgaas@kernel.org
Signed-off-by: Frederick Lawler <fred@fredlawl.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index af5d9f92e6d5abb2961981e37cc9d0c22d1ed048..2f0295b48d5dbafaea00ea68cc5d84c3fccd07e8 100644 (file)
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -35,22 +35,22 @@ extern int pciehp_poll_time;
  * enable debug messages.
  */
 #define dbg(format, arg...)                                            \
-       pr_debug("%s: " format, MY_NAME, ## arg);
+       pr_debug(format, ## arg);
 #define err(format, arg...)                                            \
-       printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
+       pr_err(format, ## arg)
 #define info(format, arg...)                                           \
-       printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
+       pr_info(format, ## arg)
 #define warn(format, arg...)                                           \
-       printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
+       pr_warn(format, ## arg)
 
 #define ctrl_dbg(ctrl, format, arg...)                                 \
-       dev_dbg(&ctrl->pcie->device, format, ## arg)
+       pci_dbg(ctrl->pcie->port, format, ## arg)
 #define ctrl_err(ctrl, format, arg...)                                 \
-       dev_err(&ctrl->pcie->device, format, ## arg)
+       pci_err(ctrl->pcie->port, format, ## arg)
 #define ctrl_info(ctrl, format, arg...)                                        \
-       dev_info(&ctrl->pcie->device, format, ## arg)
+       pci_info(ctrl->pcie->port, format, ## arg)
 #define ctrl_warn(ctrl, format, arg...)                                        \
-       dev_warn(&ctrl->pcie->device, format, ## arg)
+       pci_warn(ctrl->pcie->port, format, ## arg)
 
 #define SLOT_NAME_SIZE 10
 

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 6ff204c435bf200b737ad9e4595d56466960edd9..b85b22880c50576ec18c3d472ce08f60bbfdb5e8 100644 (file)
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -17,6 +17,9 @@
  *   Dely Sy <dely.l.sy@intel.com>"
  */
 
+#define pr_fmt(fmt) "pciehp: " fmt
+#define dev_fmt pr_fmt
+
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -179,14 +182,14 @@ static int pciehp_probe(struct pcie_device *dev)
 
        if (!dev->port->subordinate) {
                /* Can happen if we run out of bus numbers during probe */
-               dev_err(&dev->device,
+               pci_err(dev->port,
                        "Hotplug bridge without secondary bus, ignoring\n");
                return -ENODEV;
        }
 
        ctrl = pcie_init(dev);
        if (!ctrl) {
-               dev_err(&dev->device, "Controller initialization failed\n");
+               pci_err(dev->port, "Controller initialization failed\n");
                return -ENODEV;
        }
        set_service_data(dev, ctrl);

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 3f3df4c29f6e1d40112343e91f902735a6b4d535..bf81f977a751ad1c807105d6f2527d3a16fd3747 100644 (file)
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -13,6 +13,8 @@
  *
  */
 
+#define dev_fmt(fmt) "pciehp: " fmt
+
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pm_runtime.h>

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index e121f1c06c21b418f91898c05930c8f7ad2168fd..913c7e66504f7449beef73b39abe69dec1407276 100644 (file)
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -12,6 +12,8 @@
  * Send feedback to <greg@kroah.com>,<kristen.c.accardi@intel.com>
  */
 
+#define dev_fmt(fmt) "pciehp: " fmt
+
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/jiffies.h>

diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index b9c1396db6fe9575065ba28188f4eef59bd1a3b5..d17f3bf36f70913f7f12713389aa4faab324105f 100644 (file)
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -13,6 +13,8 @@
  *
  */
 
+#define dev_fmt(fmt) "pciehp: " fmt
+
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>