On Saturday 25 July 2009, Dmitry Torokhov wrote: > On Sat, Jul 25, 2009 at 08:18:58PM +0200, Frans Pop wrote: > > On Saturday 25 July 2009, Dmitry Torokhov wrote: > > > On Wed, Jul 22, 2009 at 05:18:39PM +0200, Manuel Lauss wrote: > > > > Cc: Frans Pop <elendil@xxxxxxxxx> > > > > Signed-off-by: Manuel Lauss <manuel.lauss@xxxxxxxxx> > > > > > > > > + > > > > +static struct dev_pm_ops au1xmmc_pmops = { > > > > + .resume = au1xmmc_resume, > > > > + .suspend = au1xmmc_suspend, > > > > +}; > > > > + > > > > > > Was suspend to disk tested? It requires freeze()/thaw(). > > > > Is that a regression introduced by this patch then? If so, many more of > > the recent dev_pm_ops conversion patches would need to be revisited. > > Yes, as far as I understand they would. Let's ask Rafael to confirm... Yes, they would. In general, you'd probably want to do something like this: static struct dev_pm_ops au1xmmc_pmops = { .resume = au1xmmc_resume, .suspend = au1xmmc_suspend, .freeze = au1xmmc_resume, .thaw = au1xmmc_suspend, .restore = au1xmmc_resume, .poweroff = au1xmmc_suspend, }; but in this particular case it's probably better to define separate callbacks for .freeze() and .thaw() at least. During hibernation we call .freeze() and .thaw() before and after creating the image, respectively, and then .poweroff() is called right after the image has been saved. During resume .freeze() is called after the image has been loaded and before the control goes to the image kernel, which then calls .restore(). HTH I see I forgot about that myself. I'll fix up the floppy and hp-wmi patches. Best, Rafael