From patchwork Wed Jul 25 20:48:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 1239621 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8B8DEDFFCD for ; Wed, 25 Jul 2012 20:43:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751150Ab2GYUnM (ORCPT ); Wed, 25 Jul 2012 16:43:12 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:57224 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751101Ab2GYUnL (ORCPT ); Wed, 25 Jul 2012 16:43:11 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 3EF661DB1CB; Wed, 25 Jul 2012 22:37:11 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 28068-02; Wed, 25 Jul 2012 22:36:57 +0200 (CEST) Received: from ferrari.rjw.lan (62-121-64-87.home.aster.pl [62.121.64.87]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id ADA261DAF9A; Wed, 25 Jul 2012 22:36:56 +0200 (CEST) From: "Rafael J. Wysocki" To: Alan Stern , Bjorn Helgaas Subject: [PATCH][update] PCI / PM: Fix messages printed by acpi_pci_set_power_state() Date: Wed, 25 Jul 2012 22:48:52 +0200 User-Agent: KMail/1.13.6 (Linux/3.5.0+; KDE/4.6.0; x86_64; ; ) Cc: huang ying , =?iso-8859-1?q?Bj=F8rn_Mork?= , Huang Ying , Zheng Yan , linux-pci@vger.kernel.org, linux-usb@vger.kernel.org, Linux PM list References: In-Reply-To: MIME-Version: 1.0 Message-Id: <201207252248.52620.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Wednesday, July 25, 2012, Alan Stern wrote: > On Wed, 25 Jul 2012, Rafael J. Wysocki wrote: > > > > > If a PCI device is put into D3_cold by acpi_bus_set_power(), > > the message printed by acpi_pci_set_power_state() says that its > > power state has been changed to D4, which doesn't make sense. > > In turn, if the device is put into D3_hot, the message says just > > "D3" without specifying which variant of D3 it is. > > > > Fix that by using an array of state names corresponding to the > > PCI device power states instead of building the state name from > > the numeric value corresponding to the given state directly. > > > > Signed-off-by: Rafael J. Wysocki > > --- > > drivers/pci/pci-acpi.c | 14 +++++++++++--- > > 1 file changed, 11 insertions(+), 3 deletions(-) > > > > Index: linux/drivers/pci/pci-acpi.c > > =================================================================== > > --- linux.orig/drivers/pci/pci-acpi.c > > +++ linux/drivers/pci/pci-acpi.c > > @@ -265,9 +265,17 @@ static int acpi_pci_set_power_state(stru > > error = acpi_bus_set_power(handle, state_conv[state]); > > } > > > > - if (!error) > > - dev_printk(KERN_INFO, &dev->dev, > > - "power state changed by ACPI to D%d\n", state); > > + if (!error) { > > + static const char *state_name[] = { > > + [PCI_D0] = "D0", > > + [PCI_D1] = "D1", > > + [PCI_D2] = "D2", > > + [PCI_D3hot] = "D3hot", > > + [PCI_D3cold] = "D3cold" > > + }; > > + dev_info(&dev->dev, "power state changed by ACPI to %s\n", > > + state_name[state]); > > + } > > How about using the pci_power_name macro defined in > include/linux/pci.h instead? That's even better, I forgot that the macro was there. :-) Updated patch follows. Thanks, Rafael --- From: Rafael J. Wysocki Subject: PCI / PM: Fix messages printed by acpi_pci_set_power_state() If a PCI device is put into D3_cold by acpi_bus_set_power(), the message printed by acpi_pci_set_power_state() says that its power state has been changed to D4, which doesn't make sense. In turn, if the device is put into D3_hot, the message simply says "D3" without specifying the variant of the D3 state. Fix this by using the pci_power_name() macro for printing the state name instead of building it from the numeric value corresponding to the given state directly. Signed-off-by: Rafael J. Wysocki --- drivers/pci/pci-acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux/drivers/pci/pci-acpi.c =================================================================== --- linux.orig/drivers/pci/pci-acpi.c +++ linux/drivers/pci/pci-acpi.c @@ -266,8 +266,8 @@ static int acpi_pci_set_power_state(stru } if (!error) - dev_printk(KERN_INFO, &dev->dev, - "power state changed by ACPI to D%d\n", state); + dev_info(&dev->dev, "power state changed by ACPI to %s\n", + pci_power_name(state)); return error; }