Commit 94dbc956 authored by Frederick Lawler's avatar Frederick Lawler Committed by Bjorn Helgaas
Browse files

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: default avatarFrederick Lawler <fred@fredlawl.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
parent 01712472

drivers/pci/hotplug/pciehp.h

+8 −8
Original line number Diff line number Diff line
@@ -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

drivers/pci/hotplug/pciehp_core.c

+5 −2
Original line number Diff line number Diff line
@@ -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);

drivers/pci/hotplug/pciehp_ctrl.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 *

 */



#define dev_fmt(fmt) "pciehp: " fmt



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/pm_runtime.h>

drivers/pci/hotplug/pciehp_hpc.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

drivers/pci/hotplug/pciehp_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
 *

 */



#define dev_fmt(fmt) "pciehp: " fmt



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/pci.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE