ACPI: PM: Clean up printing messages

Replace the remaining ACPI_DEBUG_PRINT() instances in device_pm.c
with dev_dbg() invocations, drop the _COMPONENT and ACPI_MODULE_NAME()
definitions that are not used any more, and drop the no longer needed
ACPI_POWER_COMPONENT definition from the headers and documentation.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/Documentation/firmware-guide/acpi/debug.rst b/Documentation/firmware-guide/acpi/debug.rst
index 1a152dd..73f88a2 100644 (file)
--- a/Documentation/firmware-guide/acpi/debug.rst
+++ b/Documentation/firmware-guide/acpi/debug.rst
@@ -59,7 +59,6 @@ shows the supported mask values, currently these::
     ACPI_SBS_COMPONENT              0x00100000
     ACPI_FAN_COMPONENT              0x00200000
     ACPI_PCI_COMPONENT              0x00400000
-    ACPI_POWER_COMPONENT            0x00800000
     ACPI_CONTAINER_COMPONENT        0x01000000
     ACPI_SYSTEM_COMPONENT           0x02000000
     ACPI_THERMAL_COMPONENT          0x04000000

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 3586434..0961537 100644 (file)
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -10,6 +10,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
+#define pr_fmt(fmt) "ACPI: PM: " fmt
+
 #include <linux/acpi.h>
 #include <linux/export.h>
 #include <linux/mutex.h>
@@ -20,9 +22,6 @@
 
 #include "internal.h"
 
-#define _COMPONENT     ACPI_POWER_COMPONENT
-ACPI_MODULE_NAME("device_pm");
-
 /**
  * acpi_power_state_string - String representation of ACPI device power state.
  * @state: ACPI device power state to return the string representation of.
@@ -130,8 +129,8 @@ int acpi_device_get_power(struct acpi_device *device, int *state)
        *state = result;
 
  out:
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is %s\n",
-                         device->pnp.bus_id, acpi_power_state_string(*state)));
+       dev_dbg(&device->dev, "Device power state is %s\n",
+               acpi_power_state_string(*state));
 
        return 0;
 }
@@ -174,9 +173,8 @@ int acpi_device_set_power(struct acpi_device *device, int state)
 
        /* There is a special case for D0 addressed below. */
        if (state > ACPI_STATE_D0 && state == device->power.state) {
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] already in %s\n",
-                                 device->pnp.bus_id,
-                                 acpi_power_state_string(state)));
+               dev_dbg(&device->dev, "Device already in %s\n",
+                       acpi_power_state_string(state));
                return 0;
        }
 
@@ -276,10 +274,8 @@ int acpi_device_set_power(struct acpi_device *device, int state)
                         acpi_power_state_string(target_state));
        } else {
                device->power.state = target_state;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                 "Device [%s] transitioned to %s\n",
-                                 device->pnp.bus_id,
-                                 acpi_power_state_string(target_state)));
+               dev_dbg(&device->dev, "Power state changed to %s\n",
+                       acpi_power_state_string(target_state));
        }
 
        return result;

diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index a5cc4f3..eeb0419 100644 (file)
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -59,7 +59,6 @@ static const struct acpi_dlayer acpi_debug_layers[] = {
        ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_FAN_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_PCI_COMPONENT),
-       ACPI_DEBUG_INIT(ACPI_POWER_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_CONTAINER_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_SYSTEM_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_THERMAL_COMPONENT),

diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index d4f39a2..14da491 100644 (file)
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -22,7 +22,6 @@
 #define ACPI_SBS_COMPONENT             0x00100000
 #define ACPI_FAN_COMPONENT             0x00200000
 #define ACPI_PCI_COMPONENT             0x00400000
-#define ACPI_POWER_COMPONENT           0x00800000
 #define ACPI_CONTAINER_COMPONENT       0x01000000
 #define ACPI_SYSTEM_COMPONENT          0x02000000
 #define ACPI_THERMAL_COMPONENT         0x04000000