PCI: pciehp: Remove unused dbg/err/info/warn() wrappers

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/20190509141456.223614-9-helgaas@kernel.org
Signed-off-by: Frederick Lawler <fred@fredlawl.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 2f0295b48d5dbafaea00ea68cc5d84c3fccd07e8..c206fd9cd3d7acddcdda0ea0c834697993780b00 100644 (file)
--- 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 b85b22880c50576ec18c3d472ce08f60bbfdb5e8..1643e9aa261cb6da1c1bbc66d59b8587b3174bb3 100644 (file)
--- 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 913c7e66504f7449beef73b39abe69dec1407276..9ce93b1034bdfcabb97531a71aac9f5a6e80effc 100644 (file)
--- 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);