From akpm@osdl.org Mon Aug 14 23:11:15 2006 Message-Id: <200608150611.k7F6B5Pb013378@shell0.pdx.osdl.net> Subject: [patch 4/9] PM: PCI and IDE handle PM_EVENT_PRETHAW To: greg@kroah.com Cc: linux-usb-devel@lists.sourceforge.net, akpm@osdl.org, david-b@pacbell.net, dbrownell@users.sourceforge.net, pavel@ucw.cz, rjw@sisk.pl From: akpm@osdl.org Date: Mon, 14 Aug 2006 23:11:05 -0700 From: David Brownell 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 Cc: "Rafael J. Wysocki" Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/ide/ide.c | 6 ++++-- drivers/pci/pci.c | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) --- gregkh-2.6.orig/drivers/ide/ide.c +++ gregkh-2.6/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 de 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); } --- gregkh-2.6.orig/drivers/pci/pci.c +++ gregkh-2.6/drivers/pci/pci.c @@ -432,10 +432,12 @@ pci_power_t pci_choose_state(struct pci_ 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;