Merge tag 'powerpc-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-hirsute-kernel.git] / drivers / pci / hotplug / pciehp.h

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 506e1d923a1ffc74d27ce4e608bf6cc5744e89bc..8c51a04b8083e1d1d7a4894b90a95b8231214199 100644 (file)
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -25,36 +25,21 @@
 
 #include "../pcie/portdrv.h"
 
-#define MY_NAME        "pciehp"
-
 extern bool pciehp_poll_mode;
 extern int pciehp_poll_time;
-extern bool pciehp_debug;
-
-#define dbg(format, arg...)                                            \
-do {                                                                   \
-       if (pciehp_debug)                                               \
-               printk(KERN_DEBUG "%s: " format, MY_NAME, ## arg);      \
-} while (0)
-#define err(format, arg...)                                            \
-       printk(KERN_ERR "%s: " format, MY_NAME, ## arg)
-#define info(format, arg...)                                           \
-       printk(KERN_INFO "%s: " format, MY_NAME, ## arg)
-#define warn(format, arg...)                                           \
-       printk(KERN_WARNING "%s: " format, MY_NAME, ## arg)
 
+/*
+ * Set CONFIG_DYNAMIC_DEBUG=y and boot with 'dyndbg="file pciehp* +p"' to
+ * enable debug messages.
+ */
 #define ctrl_dbg(ctrl, format, arg...)                                 \
-       do {                                                            \
-               if (pciehp_debug)                                       \
-                       dev_printk(KERN_DEBUG, &ctrl->pcie->device,     \
-                                       format, ## arg);                \
-       } while (0)
+       pci_dbg(ctrl->pcie->port, format, ## arg)
 #define ctrl_err(ctrl, format, arg...)                                 \
-       dev_err(&ctrl->pcie->device, format, ## arg)
+       pci_err(ctrl->pcie->port, format, ## arg)
 #define ctrl_info(ctrl, format, arg...)                                        \
-       dev_info(&ctrl->pcie->device, format, ## arg)
+       pci_info(ctrl->pcie->port, format, ## arg)
 #define ctrl_warn(ctrl, format, arg...)                                        \
-       dev_warn(&ctrl->pcie->device, format, ## arg)
+       pci_warn(ctrl->pcie->port, format, ## arg)
 
 #define SLOT_NAME_SIZE 10