summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-08-04 23:27:32 +0200
committerBjorn Helgaas <bhelgaas@google.com>2012-08-15 11:46:18 -0600
commit3d0882c0d10d4b4785aeaf26043e764e3aaca825 (patch)
tree00e96eff1c0cebe0b83a4566813edd9cddecbdbd
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff)
downloadlinux-3d0882c0d10d4b4785aeaf26043e764e3aaca825.tar.gz
linux-3d0882c0d10d4b4785aeaf26043e764e3aaca825.tar.bz2
linux-3d0882c0d10d4b4785aeaf26043e764e3aaca825.zip
PCI / PM: Fix D3/D3cold/D4 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 <rjw@sisk.pl> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/pci-acpi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index fbf7b26c7c8a..c5792d622dc4 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -266,8 +266,8 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
}
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;
}