summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-08-31 01:09:47 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-09-26 08:08:38 +0400
commit1d3a82af45428c5e8deaa119cdeb79611ae46371 (patch)
treee8e5b7a03a979e149541149cab5570352b90656f /drivers/pci
parent1ebfd79eb46a89eacf3cbdf4a463d5d572d3557b (diff)
downloadlinux-1d3a82af45428c5e8deaa119cdeb79611ae46371.tar.xz
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/pci')
-rw-r--r--drivers/pci/pci-driver.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 9e7d6ceb3805..8948ac9ab681 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,