From patchwork Thu Aug 1 00:49:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 2836694 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 70643C0319 for ; Thu, 1 Aug 2013 00:49:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 823AF202F7 for ; Thu, 1 Aug 2013 00:49:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95AB3202F0 for ; Thu, 1 Aug 2013 00:49:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750983Ab3HAAtA (ORCPT ); Wed, 31 Jul 2013 20:49:00 -0400 Received: from mga01.intel.com ([192.55.52.88]:52972 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863Ab3HAAs7 (ORCPT ); Wed, 31 Jul 2013 20:48:59 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 31 Jul 2013 17:48:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,791,1367996400"; d="scan'208";a="379222353" Received: from aaronlu.sh.intel.com ([10.239.36.102]) by fmsmga002.fm.intel.com with ESMTP; 31 Jul 2013 17:48:57 -0700 Message-ID: <51F9B0A9.8000207@intel.com> Date: Thu, 01 Aug 2013 08:49:45 +0800 From: Aaron Lu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: "Rafael J. Wysocki" CC: ACPI Devel Maling List , LKML , Linux PM list , Yinghai Lu , Bjorn Helgaas , Tejun Heo , linux-ide@vger.kernel.org Subject: [PATCH updated] ACPI / PM: Add state information in error message for acpi_device_set_power References: <10433383.dueoNg39qi@vostro.rjw.lan> <4285597.UpTJrMA8Fu@vostro.rjw.lan> <51F8B445.1070000@intel.com> <1858303.iaJrUSpF87@vostro.rjw.lan> In-Reply-To: <1858303.iaJrUSpF87@vostro.rjw.lan> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 07/31/2013 06:27 PM, Rafael J. Wysocki wrote: >> Patch to add state information in error message, apply on top of this >> > one. >> > >> > From: Aaron Lu >> > Subject: [PATCH] ACPI / PM: Add state information in error message for >> > acpi_device_set_power >> > >> > The state information can be useful to know what the problem is when it >> > appeared in an error message about a device can not being set to a higher >> > power state than its parent, so this patch adds such state information >> > for both the target state of the device failed to be set and the current >> > parent's state. >> > >> > Signed-off-by: Aaron Lu >> > --- >> > drivers/acpi/device_pm.c | 3 ++- >> > 1 file changed, 2 insertions(+), 1 deletion(-) >> > >> > diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c >> > index beb9625..707258b 100644 >> > --- a/drivers/acpi/device_pm.c >> > +++ b/drivers/acpi/device_pm.c >> > @@ -179,7 +179,8 @@ int acpi_device_set_power(struct acpi_device *device, int state) >> > } >> > if (device->parent && (state < device->parent->power.state)) { >> > dev_warn(&device->dev, >> > - "Cannot transition to a higher-powered state than parent\n"); >> > + "Cannot transition to a higher-powered state %d than parent's state %d\n", > This message will look a little odd I think -> > >> > + state, device->parent->power.state); > -> and please don't use raw numbers in such messages. > > What about > > "Cannot transition to power state %s for parent in %s\n", > acpi_power_state_string(state), > acpi_power_state_string(device->parent->power.state) Thanks for the suggestion, updated patch here: From: Aaron Lu Subject: [PATCH] ACPI / PM: Add state information in error message for acpi_device_set_power The state information can be useful to know what the problem is when an error message about a device can not being set to a higher power state than its parent appeared, so this patch adds such state information for both the target state of the device and the current state of its parent. Signed-off-by: Aaron Lu --- drivers/acpi/device_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index beb9625..59d3202 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -179,7 +179,9 @@ int acpi_device_set_power(struct acpi_device *device, int state) } if (device->parent && (state < device->parent->power.state)) { dev_warn(&device->dev, - "Cannot transition to a higher-powered state than parent\n"); + "Cannot transition to power state %s for parent in %s\n", + acpi_power_state_string(state), + acpi_power_state_string(device->parent->power.state)); return -ENODEV; }