[PATCH] pm: print name of failed suspend function

Print more diagnostic info to help identify the source of power management
suspend failures.

Example:

usb_hcd_pci_suspend(): pci_set_power_state+0x0/0x1af() returns -22
pci_device_suspend(): usb_hcd_pci_suspend+0x0/0x11b() returns -22
suspend_device(): pci_device_suspend+0x0/0x34() returns -22

Work-in-progress.  It needs lots more suspend_report_result() calls sprinkled
everywhere.

Cc: Patrick Mochel <mochel@digitalimplant.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@suspend2.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index f22f69ac6445..1456759936c5 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -271,10 +271,12 @@ static int pci_device_suspend(struct device * dev, pm_message_t state)
         struct pci_driver * drv = pci_dev->driver;
         int i = 0;
 
-        if (drv && drv->suspend)
+        if (drv && drv->suspend) {
                 i = drv->suspend(pci_dev, state);
-        else
+                suspend_report_result(drv->suspend, i);
+        } else {
                 pci_save_state(pci_dev);
+        }
         return i;
 }
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index bea1ad1ad5ba..042fa5265cf6 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -307,9 +307,11 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
          * Can enter D0 from any state, but if we can only go deeper 
          * to sleep if we're already in a low power state
          */
-        if (state != PCI_D0 && dev->current_state > state)
+        if (state != PCI_D0 && dev->current_state > state) {
+                printk(KERN_ERR "%s(): %s: state=%d, current state=%d\n",
+                        __FUNCTION__, pci_name(dev), state, dev->current_state);
                 return -EINVAL;
-        else if (dev->current_state == state) 
+        } else if (dev->current_state == state)
                 return 0;        /* we're already there */
 
         /* find PCI PM capability in list */