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>

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index e86db83746acb4e65c9a3275efca47811ac27b14..6453c25103d236ad55acf08c6cd9c31ae40fb38b 100644 (file)
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -117,33 +117,6 @@ static int suspend_device_late(struct device *dev, pm_message_t state)
        return error;
 }
 
-/**
- *     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 9e7d6ceb38057beb48134c2931b68dc227160474..8948ac9ab6812e9353bb166940410c096e06238b 100644 (file)
--- 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,

diff --git a/include/linux/device.h b/include/linux/device.h
index b40be6fca6fa091f10dfb68372e212cafe43ae7c..b3646462d6dc1919fdf7d67f590394faa936a387 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -52,7 +52,6 @@ struct bus_type {
        int             (*remove)(struct device * dev);
        void            (*shutdown)(struct device * dev);
 
-       int (*suspend_prepare)(struct device * dev, pm_message_t state);
        int (*suspend)(struct device * dev, pm_message_t state);
        int (*suspend_late)(struct device * dev, pm_message_t state);
        int (*resume_early)(struct device * dev);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 4b2e629467c77cfb727a906ee892202c48429c74..9514bbfe96e2e2c100a1f592c19e80932142634b 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -345,7 +345,6 @@ struct pci_driver {
        const struct pci_device_id *id_table;   /* must be non-NULL for probe to be called */
        int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);   /* New device inserted */
        void (*remove) (struct pci_dev *dev);   /* Device removed (NULL if not a hot-plug capable driver) */
-       int  (*suspend_prepare) (struct pci_dev *dev, pm_message_t state);
        int  (*suspend) (struct pci_dev *dev, pm_message_t state);      /* Device suspended */
        int  (*suspend_late) (struct pci_dev *dev, pm_message_t state);
        int  (*resume_early) (struct pci_dev *dev);

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 0c3ed6ac938e99acf13ca9a833c72fcc31011105..6d295c77679414f0e2c66a6a0ba3db643dc7d659 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -57,10 +57,6 @@ static int suspend_prepare(suspend_state_t state)
        if (!pm_ops || !pm_ops->enter)
                return -EPERM;
 
-       error = device_prepare_suspend(PMSG_SUSPEND);
-       if (error)
-               return error;
-
        pm_prepare_console();
 
        disable_nonboot_cpus();