From: Bjorn Helgaas <helgaas@kernel.org>
To: Frederick Lawler <fred@fredlawl.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
Lukas Wunner <lukas@wunner.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Keith Busch <keith.busch@intel.com>,
Dongdong Liu <liudongdong3@huawei.com>,
Sven Van Asbroeck <thesven73@gmail.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH 05/10] PCI: pciehp: Remove pciehp_debug uses
Date: Thu, 9 May 2019 09:14:51 -0500 [thread overview]
Message-ID: <20190509141456.223614-6-helgaas@kernel.org> (raw)
In-Reply-To: <20190509141456.223614-1-helgaas@kernel.org>
From: Bjorn Helgaas <bhelgaas@google.com>
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.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/hotplug/pciehp_hpc.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 6a2365cd794e..e121f1c06c21 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -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, ®16);
- 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, ®16);
- ctrl_info(ctrl, "Slot Control : 0x%04x\n", reg16);
+ ctrl_dbg(ctrl, "Slot Control : 0x%04x\n", reg16);
}
#define FLAG(x, y) (((x) & (y)) ? '+' : '-')
--
2.21.0.1020.gf2820cf01a-goog
next prev parent reply other threads:[~2019-05-09 14:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-09 14:14 [PATCH v4 00/10] PCI: Log with pci_dev, not pcie_device Bjorn Helgaas
2019-05-09 14:14 ` [PATCH 01/10] PCI/AER: Replace dev_printk(KERN_DEBUG) with dev_info() Bjorn Helgaas
2019-05-09 17:36 ` Andy Shevchenko
2019-05-09 21:08 ` Bjorn Helgaas
2019-05-09 14:14 ` [PATCH 02/10] PCI/PME: " Bjorn Helgaas
2019-05-09 17:35 ` Andy Shevchenko
2019-05-09 18:31 ` Joe Perches
2019-05-09 21:12 ` Bjorn Helgaas
2019-05-10 2:22 ` Joe Perches
2019-05-09 14:14 ` [PATCH 03/10] PCI/DPC: Log messages with pci_dev, not pcie_device Bjorn Helgaas
2019-05-09 17:39 ` Andy Shevchenko
2019-05-09 21:18 ` Bjorn Helgaas
2019-05-09 14:14 ` [PATCH 04/10] PCI/AER: " Bjorn Helgaas
2019-05-09 17:42 ` Andy Shevchenko
2019-05-09 21:44 ` Bjorn Helgaas
2019-05-09 14:14 ` Bjorn Helgaas [this message]
2019-05-09 14:14 ` [PATCH 06/10] PCI: pciehp: Replace pciehp_debug module param with dyndbg Bjorn Helgaas
2019-05-09 14:14 ` [PATCH 07/10] PCI: pciehp: Log messages with pci_dev, not pcie_device Bjorn Helgaas
2019-05-09 14:14 ` [PATCH 08/10] PCI: pciehp: Remove unused dbg/err/info/warn() wrappers Bjorn Helgaas
2019-05-09 14:14 ` [PATCH 09/10] PCI: pciehp: Remove pointless PCIE_MODULE_NAME definition Bjorn Helgaas
2019-05-09 14:14 ` [PATCH 10/10] PCI: pciehp: Remove pointless MY_NAME definition Bjorn Helgaas
2019-05-09 15:07 ` [PATCH v4 00/10] PCI: Log with pci_dev, not pcie_device Keith Busch
2019-05-09 17:10 ` Bjorn Helgaas
2019-05-09 17:49 ` Andy Shevchenko
2019-05-09 21:49 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190509141456.223614-6-helgaas@kernel.org \
--to=helgaas@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=fred@fredlawl.com \
--cc=keith.busch@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=liudongdong3@huawei.com \
--cc=lukas@wunner.de \
--cc=mika.westerberg@linux.intel.com \
--cc=thesven73@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).