[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190509141456.223614-9-helgaas@kernel.org>
Date: Thu, 9 May 2019 09:14:54 -0500
From: Bjorn Helgaas <helgaas@...nel.org>
To: Frederick Lawler <fred@...dlawl.com>
Cc: Mika Westerberg <mika.westerberg@...ux.intel.com>,
Lukas Wunner <lukas@...ner.de>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Keith Busch <keith.busch@...el.com>,
Dongdong Liu <liudongdong3@...wei.com>,
Sven Van Asbroeck <thesven73@...il.com>,
linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org,
Bjorn Helgaas <bhelgaas@...gle.com>
Subject: [PATCH 08/10] PCI: pciehp: Remove unused dbg/err/info/warn() wrappers
From: Frederick Lawler <fred@...dlawl.com>
Replace the last uses of dbg() with the equivalent pr_debug(), then remove
unused dbg(), err(), info(), and warn() wrappers.
Link: https://lore.kernel.org/lkml/20190503035946.23608-9-fred@fredlawl.com
Signed-off-by: Frederick Lawler <fred@...dlawl.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com>
---
drivers/pci/hotplug/pciehp.h | 9 ---------
drivers/pci/hotplug/pciehp_core.c | 4 ++--
drivers/pci/hotplug/pciehp_hpc.c | 2 +-
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 2f0295b48d5d..c206fd9cd3d7 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -34,15 +34,6 @@ extern int pciehp_poll_time;
* Set CONFIG_DYNAMIC_DEBUG=y and boot with 'dyndbg="file pciehp* +p"' to
* enable debug messages.
*/
-#define dbg(format, arg...) \
- pr_debug(format, ## arg);
-#define err(format, arg...) \
- pr_err(format, ## arg)
-#define info(format, arg...) \
- pr_info(format, ## arg)
-#define warn(format, arg...) \
- pr_warn(format, ## arg)
-
#define ctrl_dbg(ctrl, format, arg...) \
pci_dbg(ctrl->pcie->port, format, ## arg)
#define ctrl_err(ctrl, format, arg...) \
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index b85b22880c50..1643e9aa261c 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -328,9 +328,9 @@ int __init pcie_hp_init(void)
int retval = 0;
retval = pcie_port_service_register(&hpdriver_portdrv);
- dbg("pcie_port_service_register = %d\n", retval);
+ pr_debug("pcie_port_service_register = %d\n", retval);
if (retval)
- dbg("Failure to register service\n");
+ pr_debug("Failure to register service\n");
return retval;
}
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 913c7e66504f..9ce93b1034bd 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -235,7 +235,7 @@ static bool pci_bus_check_dev(struct pci_bus *bus, int devfn)
} while (delay > 0);
if (count > 1)
- dbg("pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n",
+ pr_debug("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);
--
2.21.0.1020.gf2820cf01a-goog
Powered by blists - more mailing lists