PCI: acpiphp: Convert to dynamic debug

This patch is to use pr_debug/info/warn/err to replace acpiphp debug
functions and remove module's debug param.

User interface change: before this patch, boot with the "acpiphp.debug"
kernel parameter to turn on debug.  After this patch, set
CONFIG_DYNAMIC_DEBUG=y and boot with "acpiphp.dyndebug=+p" instead.
See Documentation/dynamic-debug-howto.txt.

[bhelgaas: changelog]
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 0b7d23b4ad95..6557702a0592 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -39,6 +39,8 @@
  *    bus. It loses the refcount when the the driver unloads.
  */
 
+#define pr_fmt(fmt) "acpiphp_glue: " fmt
+
 #include <linux/init.h>
 #include <linux/module.h>
 
@@ -58,8 +60,6 @@ static LIST_HEAD(bridge_list);
 static DEFINE_MUTEX(bridge_mutex);
 static DEFINE_MUTEX(acpiphp_context_lock);
 
-#define MY_NAME "acpiphp_glue"
-
 static void handle_hotplug_event(acpi_handle handle, u32 type, void *data);
 static void acpiphp_sanitize_bus(struct pci_bus *bus);
 static void acpiphp_set_hpp_values(struct pci_bus *bus);
@@ -335,7 +335,7 @@ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *data,
                 if (ACPI_FAILURE(status))
                         sun = bridge->nr_slots;
 
-                dbg("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n",
+                pr_debug("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n",
                     sun, pci_domain_nr(pbus), pbus->number, device);
 
                 retval = acpiphp_register_hotplug_slot(slot, sun);
@@ -343,10 +343,10 @@ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *data,
                         slot->slot = NULL;
                         bridge->nr_slots--;
                         if (retval == -EBUSY)
-                                warn("Slot %llu already registered by another "
+                                pr_warn("Slot %llu already registered by another "
                                         "hotplug driver\n", sun);
                         else
-                                warn("acpiphp_register_hotplug_slot failed "
+                                pr_warn("acpiphp_register_hotplug_slot failed "
                                         "(err code = 0x%x)\n", retval);
                 }
                 /* Even if the slot registration fails, we can still use it. */
@@ -369,7 +369,7 @@ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *data,
                 if (register_hotplug_dock_device(handle,
                         &acpiphp_dock_ops, context,
                         acpiphp_dock_init, acpiphp_dock_release))
-                        dbg("failed to register dock device\n");
+                        pr_debug("failed to register dock device\n");
         }
 
         /* install notify handler */
@@ -427,7 +427,7 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge)
                                                         ACPI_SYSTEM_NOTIFY,
                                                         handle_hotplug_event);
                                 if (ACPI_FAILURE(status))
-                                        err("failed to remove notify handler\n");
+                                        pr_err("failed to remove notify handler\n");
                         }
                 }
                 if (slot->slot)
@@ -830,8 +830,9 @@ static void hotplug_event(acpi_handle handle, u32 type, void *data)
         switch (type) {
         case ACPI_NOTIFY_BUS_CHECK:
                 /* bus re-enumerate */
-                dbg("%s: Bus check notify on %s\n", __func__, objname);
-                dbg("%s: re-enumerating slots under %s\n", __func__, objname);
+                pr_debug("%s: Bus check notify on %s\n", __func__, objname);
+                pr_debug("%s: re-enumerating slots under %s\n",
+                         __func__, objname);
                 if (bridge) {
                         acpiphp_check_bridge(bridge);
                 } else {
@@ -845,7 +846,7 @@ static void hotplug_event(acpi_handle handle, u32 type, void *data)
 
         case ACPI_NOTIFY_DEVICE_CHECK:
                 /* device check */
-                dbg("%s: Device check notify on %s\n", __func__, objname);
+                pr_debug("%s: Device check notify on %s\n", __func__, objname);
                 if (bridge) {
                         acpiphp_check_bridge(bridge);
                 } else {
@@ -866,7 +867,7 @@ static void hotplug_event(acpi_handle handle, u32 type, void *data)
 
         case ACPI_NOTIFY_EJECT_REQUEST:
                 /* request device eject */
-                dbg("%s: Device eject notify on %s\n", __func__, objname);
+                pr_debug("%s: Device eject notify on %s\n", __func__, objname);
                 acpiphp_disable_and_eject_slot(func->slot);
                 break;
         }