ACPI / PM: Common string representations of device power states

The function returning string representations of ACPI device power
states, state_string((), is now static, because it is only used
internally in drivers/acpi/bus.c.  However, it will be used outside
of that file going forward, so rename it to
acpi_power_state_string(), add a kerneldoc comment to it and add its
header to acpi_bus.h.

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

2 files changed, 13 insertions, 6 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 0e1441cc4d7f..6c9b16c16660 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -182,7 +182,11 @@ EXPORT_SYMBOL(acpi_bus_get_private_data);
                                  Power Management
    -------------------------------------------------------------------------- */
 
-static const char *state_string(int state)
+/**
+ * acpi_power_state_string - String representation of ACPI device power state.
+ * @state: ACPI device power state to return the string representation of.
+ */
+const char *acpi_power_state_string(int state)
 {
         switch (state) {
         case ACPI_STATE_D0:
@@ -260,7 +264,7 @@ int acpi_device_get_power(struct acpi_device *device, int *state)
 
  out:
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is %s\n",
-                          device->pnp.bus_id, state_string(*state)));
+                          device->pnp.bus_id, acpi_power_state_string(*state)));
 
         return 0;
 }
@@ -288,13 +292,13 @@ int acpi_device_set_power(struct acpi_device *device, int state)
 
         if (state == device->power.state) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at %s\n",
-                                  state_string(state)));
+                                  acpi_power_state_string(state)));
                 return 0;
         }
 
         if (!device->power.states[state].flags.valid) {
                 printk(KERN_WARNING PREFIX "Device does not support %s\n",
-                       state_string(state));
+                       acpi_power_state_string(state));
                 return -ENODEV;
         }
         if (device->parent && (state < device->parent->power.state)) {
@@ -362,12 +366,14 @@ int acpi_device_set_power(struct acpi_device *device, int state)
         if (result)
                 printk(KERN_WARNING PREFIX
                               "Device [%s] failed to transition to %s\n",
-                              device->pnp.bus_id, state_string(state));
+                              device->pnp.bus_id,
+                              acpi_power_state_string(state));
         else {
                 device->power.state = state;
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Device [%s] transitioned to %s\n",
-                                  device->pnp.bus_id, state_string(state)));
+                                  device->pnp.bus_id,
+                                  acpi_power_state_string(state)));
         }
 
         return result;
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 9d7c2ca0f1f7..71eceb99d411 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -331,6 +331,7 @@ acpi_status acpi_bus_get_status_handle(acpi_handle handle,
                                        unsigned long long *sta);
 int acpi_bus_get_status(struct acpi_device *device);
 int acpi_bus_set_power(acpi_handle handle, int state);
+const char *acpi_power_state_string(int state);
 int acpi_device_get_power(struct acpi_device *device, int *state);
 int acpi_device_set_power(struct acpi_device *device, int state);
 int acpi_bus_update_power(acpi_handle handle, int *state_p);