PM: PCI and IDE handle PM_EVENT_PRETHAW

Convert some framework code to handle the new PRETHAW message.

  - IDE just treats it like a FREEZE.

  - The pci_choose_state() thingie still doesn't use PCI_D0 when it gets a
    FREEZE (and now PRETHAW) event, which seems rather buglike but wasn't
    something to change with this patch.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index defd4b4bd374..9c8468de1a75 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1207,7 +1207,7 @@ int system_bus_clock (void)
 
 EXPORT_SYMBOL(system_bus_clock);
 
-static int generic_ide_suspend(struct device *dev, pm_message_t state)
+static int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 {
         ide_drive_t *drive = dev->driver_data;
         struct request rq;
@@ -1221,7 +1221,9 @@ static int generic_ide_suspend(struct device *dev, pm_message_t state)
         rq.special = &args;
         rq.end_io_data = &rqpm;
         rqpm.pm_step = ide_pm_state_start_suspend;
-        rqpm.pm_state = state.event;
+        if (mesg.event == PM_EVENT_PRETHAW)
+                mesg.event = PM_EVENT_FREEZE;
+        rqpm.pm_state = mesg.event;
 
         return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 9f79dd6d51ab..8ab027886034 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -432,10 +432,12 @@ pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
         case PM_EVENT_ON:
                 return PCI_D0;
         case PM_EVENT_FREEZE:
+        case PM_EVENT_PRETHAW:
+                /* REVISIT both freeze and pre-thaw "should" use D0 */
         case PM_EVENT_SUSPEND:
                 return PCI_D3hot;
         default:
-                printk("They asked me for state %d\n", state.event);
+                printk("Unrecognized suspend event %d\n", state.event);
                 BUG();
         }
         return PCI_D0;