From patchwork Mon May 4 17:57:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 226438 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35634C4724C for ; Mon, 4 May 2020 17:59:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1627B206B8 for ; Mon, 4 May 2020 17:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615193; bh=yuYvm1fkv6a9DEkSstB0vxNmG3SmDZImH4l1nKgoB8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JB6qT00Wn+Sj11ro6thFsZ/DG3wqFlkdD1Awaen6V0torcuIoQWZge5nDKszscHJT 3iHm/phpUcq+FKb6btIcJN1JkQmn22gYEz+MOt1z7U3e7nZuek8/KtrAEdbiDeDHWk TMCk64ytVkGODCXUYnJvgRnJhM9XGGqiVr0cVITI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730883AbgEDR7v (ORCPT ); Mon, 4 May 2020 13:59:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:53880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730880AbgEDR7u (ORCPT ); Mon, 4 May 2020 13:59:50 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 21DC620663; Mon, 4 May 2020 17:59:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615189; bh=yuYvm1fkv6a9DEkSstB0vxNmG3SmDZImH4l1nKgoB8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CMXfjA2J/TP8ysj23dHJbB+Dyic4+nmmDYc6HItikUZJRnL5szH4RiN9qQJsjr0rM KmSEN1WWHdc/4Ql77LQfRDvWdQUBoLhVnkoo/LCo7WQqa0Ub577BAkdd4dk3mzA8Qx xJ41s+jlX+zMmsTJkkDypLUFZyZ0Baxx0ICHupfg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , "Rafael J. Wysocki" Subject: [PATCH 4.9 08/18] PM: ACPI: Output correct message on target power state Date: Mon, 4 May 2020 19:57:18 +0200 Message-Id: <20200504165443.856844196@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165442.028485341@linuxfoundation.org> References: <20200504165442.028485341@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kai-Heng Feng commit a9b760b0266f563b4784f695bbd0e717610dc10a upstream. 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. Cc: All applicable Signed-off-by: Kai-Heng Feng Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/device_pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -226,13 +226,13 @@ int acpi_device_set_power(struct acpi_de 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;