Commit f4f3548d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: PM: Unify debug messages in acpi_device_set_power() 



Convert all of the debug messages printed by acpi_device_set_power()
to acpi_handle_debug() and adjust them slightly for consistency with
acpi_device_get_power() and other acpi_device_set_power() debug
messages.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 255a04cc

drivers/acpi/device_pm.c

+19 −17
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ 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) {

		dev_dbg(&device->dev, "Device already in %s\n",

		acpi_handle_debug(device->handle, "Already in %s\n",

				  acpi_power_state_string(state));

		return 0;

	}
@@ -189,15 +189,15 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
		if (!device->power.states[ACPI_STATE_D3_COLD].flags.valid)

			target_state = state;

	} else if (!device->power.states[state].flags.valid) {

		dev_warn(&device->dev, "Power state %s not supported\n",

		acpi_handle_debug(device->handle, "Power state %s not supported\n",

				  acpi_power_state_string(state));

		return -ENODEV;

	}



	if (!device->power.flags.ignore_parent &&

	    device->parent && (state < device->parent->power.state)) {

		dev_warn(&device->dev,

			 "Cannot transition to power state %s for parent in %s\n",

	if (!device->power.flags.ignore_parent && device->parent &&

	    state < device->parent->power.state) {

		acpi_handle_debug(device->handle,

				  "Cannot transition to %s for parent in %s\n",

				  acpi_power_state_string(state),

				  acpi_power_state_string(device->parent->power.state));

		return -ENODEV;
@@ -216,7 +216,8 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
		 * (deeper) states to higher-power (shallower) states.

		 */

		if (state < device->power.state) {

			dev_warn(&device->dev, "Cannot transition from %s to %s\n",

			acpi_handle_debug(device->handle,

					  "Cannot transition from %s to %s\n",

					  acpi_power_state_string(device->power.state),

					  acpi_power_state_string(state));

			return -ENODEV;
@@ -271,11 +272,12 @@ int acpi_device_set_power(struct acpi_device *device, int state) 


 end:

	if (result) {

		dev_warn(&device->dev, "Failed to change power state to %s\n",

		acpi_handle_debug(device->handle,

				  "Failed to change power state to %s\n",

				  acpi_power_state_string(target_state));

	} else {

		device->power.state = target_state;

		dev_dbg(&device->dev, "Power state changed to %s\n",

		acpi_handle_debug(device->handle, "Power state changed to %s\n",

				  acpi_power_state_string(target_state));

	}