Commit 7e696b8a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: pciehp: Remove pciehp_debug uses 

We're about to convert pciehp to the dyndbg mechanism, which means we can
eventually remove pciehp_debug.

Replace uses of pciehp_debug with dbg() and ctrl_dbg(), which check
pciehp_debug internally.

Link: https://lore.kernel.org/lkml/20190509141456.223614-6-helgaas@kernel.org


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 9cc6f75b

drivers/pci/hotplug/pciehp_hpc.c

+5 −8
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ static bool pci_bus_check_dev(struct pci_bus *bus, int devfn) 
		delay -= step;

	} while (delay > 0);



	if (count > 1 && pciehp_debug)

		printk(KERN_DEBUG "pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n",

	if (count > 1)

		dbg("pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n",

			pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),

			PCI_FUNC(devfn), count, step, l);
@@ -822,14 +822,11 @@ static inline void dbg_ctrl(struct controller *ctrl) 
	struct pci_dev *pdev = ctrl->pcie->port;

	u16 reg16;



	if (!pciehp_debug)

		return;



	ctrl_info(ctrl, "Slot Capabilities      : 0x%08x\n", ctrl->slot_cap);

	ctrl_dbg(ctrl, "Slot Capabilities      : 0x%08x\n", ctrl->slot_cap);

	pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &reg16);

	ctrl_info(ctrl, "Slot Status            : 0x%04x\n", reg16);

	ctrl_dbg(ctrl, "Slot Status            : 0x%04x\n", reg16);

	pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &reg16);

	ctrl_info(ctrl, "Slot Control           : 0x%04x\n", reg16);

	ctrl_dbg(ctrl, "Slot Control           : 0x%04x\n", reg16);

}



#define FLAG(x, y)	(((x) & (y)) ? '+' : '-')

CRA Git | Maintained and supported by SUSTech CRA and CCSE