linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ACPI: PM: Output correct message on target power state
@ 2020-04-21  7:55 Kai-Heng Feng
  2020-04-26 16:37 ` Rafael J. Wysocki
  0 siblings, 1 reply; 2+ messages in thread
From: Kai-Heng Feng @ 2020-04-21  7:55 UTC (permalink / raw)
  To: rjw; +Cc: Kai-Heng Feng, Len Brown, open list:ACPI, open list

Transitioned power state logged at the end of setting ACPI power.

However, D3cold won't be in the message because state can only be D3hot
at most.

Use target_state to corretly report when power state is D3cold.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 drivers/acpi/device_pm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index b2263ec67b43..5832bc10aca8 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -273,13 +273,13 @@ 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_power_state_string(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(state)));
+				  acpi_power_state_string(target_state)));
 	}
 
 	return result;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ACPI: PM: Output correct message on target power state
  2020-04-21  7:55 [PATCH] ACPI: PM: Output correct message on target power state Kai-Heng Feng
@ 2020-04-26 16:37 ` Rafael J. Wysocki
  0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2020-04-26 16:37 UTC (permalink / raw)
  To: Kai-Heng Feng; +Cc: Len Brown, open list:ACPI, open list

On Tuesday, April 21, 2020 9:55:16 AM CEST Kai-Heng Feng wrote:
> Transitioned power state logged at the end of setting ACPI power.
> 
> However, D3cold won't be in the message because state can only be D3hot
> at most.
> 
> Use target_state to corretly report when power state is D3cold.
> 
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
>  drivers/acpi/device_pm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
> index b2263ec67b43..5832bc10aca8 100644
> --- a/drivers/acpi/device_pm.c
> +++ b/drivers/acpi/device_pm.c
> @@ -273,13 +273,13 @@ 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_power_state_string(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(state)));
> +				  acpi_power_state_string(target_state)));
>  	}
>  
>  	return result;
> 

Applied as a fix for 5.7-rc4, thanks!





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-04-26 16:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-21  7:55 [PATCH] ACPI: PM: Output correct message on target power state Kai-Heng Feng
2020-04-26 16:37 ` Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).