diff options
| author | David Brownell <david-b@pacbell.net> | 2006-08-30 14:09:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-25 21:08:38 -0700 |
| commit | 1d3a82af45428c5e8deaa119cdeb79611ae46371 (patch) | |
| tree | e8e5b7a03a979e149541149cab5570352b90656f /drivers | |
| parent | 1ebfd79eb46a89eacf3cbdf4a463d5d572d3557b (diff) | |
| download | kernel_samsung_smdk4412-1d3a82af45428c5e8deaa119cdeb79611ae46371.zip kernel_samsung_smdk4412-1d3a82af45428c5e8deaa119cdeb79611ae46371.tar.gz kernel_samsung_smdk4412-1d3a82af45428c5e8deaa119cdeb79611ae46371.tar.bz2 | |
PM: no suspend_prepare() phase
Remove the new suspend_prepare() phase. It doesn't seem very usable,
has never been tested, doesn't address fault cleanup, and would need
a sibling resume_complete(); plus there are no real use cases. It
could be restored later if those issues get resolved.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/suspend.c | 27 | ||||
| -rw-r--r-- | drivers/pci/pci-driver.c | 14 |
2 files changed, 0 insertions, 41 deletions
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c index e86db83..6453c25 100644 --- a/drivers/base/power/suspend.c +++ b/drivers/base/power/suspend.c @@ -118,33 +118,6 @@ static int suspend_device_late(struct device *dev, pm_message_t state) } /** - * device_prepare_suspend - save state and prepare to suspend - * - * NOTE! Devices cannot detach at this point - not only do we - * hold the device list semaphores over the whole prepare, but - * the whole point is to do non-invasive preparatory work, not - * the actual suspend. - */ -int device_prepare_suspend(pm_message_t state) -{ - int error = 0; - struct device * dev; - - down(&dpm_sem); - down(&dpm_list_sem); - list_for_each_entry_reverse(dev, &dpm_active, power.entry) { - if (!dev->bus || !dev->bus->suspend_prepare) - continue; - error = dev->bus->suspend_prepare(dev, state); - if (error) - break; - } - up(&dpm_list_sem); - up(&dpm_sem); - return error; -} - -/** * device_suspend - Save state and stop all devices in system. * @state: Power state to put each device in. * diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 9e7d6ce..8948ac9 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -264,19 +264,6 @@ static int pci_device_remove(struct device * dev) return 0; } -static int pci_device_suspend_prepare(struct device * dev, pm_message_t state) -{ - struct pci_dev * pci_dev = to_pci_dev(dev); - struct pci_driver * drv = pci_dev->driver; - int i = 0; - - if (drv && drv->suspend_prepare) { - i = drv->suspend_prepare(pci_dev, state); - suspend_report_result(drv->suspend_prepare, i); - } - return i; -} - static int pci_device_suspend(struct device * dev, pm_message_t state) { struct pci_dev * pci_dev = to_pci_dev(dev); @@ -544,7 +531,6 @@ struct bus_type pci_bus_type = { .uevent = pci_uevent, .probe = pci_device_probe, .remove = pci_device_remove, - .suspend_prepare= pci_device_suspend_prepare, .suspend = pci_device_suspend, .suspend_late = pci_device_suspend_late, .resume_early = pci_device_resume_early, |