In some cases PCI device structure is not available and we want to print
information based on the bus and devfn parameters. For this cases introduce
pci_bus_*() printing macros and replace in existing users.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
drivers/pci/probe.c | 12 +++---------
include/linux/pci.h | 9 +++++++++
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 953f15abc850..7d67be52d8e5 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2268,16 +2268,12 @@ static bool pci_bus_wait_crs(struct pci_bus *bus, int devfn, u32 *l,
*/
while (pci_bus_crs_vendor_id(*l)) {
if (delay > timeout) {
- pr_warn("pci %04x:%02x:%02x.%d: not ready after %dms; giving up\n",
- pci_domain_nr(bus), bus->number,
- PCI_SLOT(devfn), PCI_FUNC(devfn), delay - 1);
+ pci_bus_warn(bus, devfn, "not ready after %dms; giving up\n", delay - 1);
return false;
}
if (delay >= 1000)
- pr_info("pci %04x:%02x:%02x.%d: not ready after %dms; waiting\n",
- pci_domain_nr(bus), bus->number,
- PCI_SLOT(devfn), PCI_FUNC(devfn), delay - 1);
+ pci_bus_info(bus, devfn, "not ready after %dms; waiting\n", delay - 1);
msleep(delay);
delay *= 2;
@@ -2287,9 +2283,7 @@ static bool pci_bus_wait_crs(struct pci_bus *bus, int devfn, u32 *l,
}
if (delay >= 1000)
- pr_info("pci %04x:%02x:%02x.%d: ready after %dms\n",
- pci_domain_nr(bus), bus->number,
- PCI_SLOT(devfn), PCI_FUNC(devfn), delay - 1);
+ pci_bus_info(bus, devfn, "ready after %dms\n", delay - 1);
return true;
}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 86c799c97b77..c557d4a8476f 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2463,4 +2463,13 @@ void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type);
WARN_ONCE(condition, "%s %s: " fmt, \
dev_driver_string(&(pdev)->dev), pci_name(pdev), ##arg)
+#define pci_bus_printk(level, bus, devfn, fmt, arg...) \
+ printk(level "pci %04x:%02x:%02x.%d: " fmt, \
+ pci_domain_nr(bus), bus->number, \
+ PCI_SLOT(devfn), PCI_FUNC(devfn), ##arg)
+
+#define pci_bus_err(bus, devfn, fmt, arg...) pci_bus_printk(KERN_ERR, bus, devfn, fmt, ##arg)
+#define pci_bus_warn(bus, devfn, fmt, arg...) pci_bus_printk(KERN_WARNING, bus, devfn, fmt, ##arg)
+#define pci_bus_info(bus, devfn, fmt, arg...) pci_bus_printk(KERN_INFO, bus, devfn, fmt, ##arg)
+
#endif /* LINUX_PCI_H */
--
2.30.1
