Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=515c53576299e32d6bdb6295cfa2fe1307516eb4
Commit:     515c53576299e32d6bdb6295cfa2fe1307516eb4
Parent:     2a0134554e12f530c6eccb1dab3f0f8954f855c9
Author:     Rafael J. Wysocki <[EMAIL PROTECTED]>
AuthorDate: Sun Jun 17 19:48:06 2007 +0200
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Jul 11 16:09:02 2007 -0700

    PM: Remove prev_state from struct dev_pm_info
    
    The prev_state member of struct dev_pm_info (defined in include/linux/pm.h) 
is
    only used during a resume to check if the device's state before the suspend 
was
    'off', in which case the device is not resumed.  However, in such cases the
    decision whether or not to resume the device should be made on the driver 
level
    and the resume callbacks from the device's bus and class should be executed
    anyway (the may be needed for some things other than just powering on the
    device).
    
    Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/base/power/resume.c  |    3 +--
 drivers/base/power/suspend.c |    2 --
 drivers/usb/core/hub.c       |    5 -----
 include/linux/pm.h           |    1 -
 4 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 99679e7..0c96106 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -88,8 +88,7 @@ void dpm_resume(void)
                list_move_tail(entry, &dpm_active);
 
                mutex_unlock(&dpm_list_mtx);
-               if (!dev->power.prev_state.event)
-                       resume_device(dev);
+               resume_device(dev);
                mutex_lock(&dpm_list_mtx);
                put_device(dev);
        }
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index af2cedf..5178b0f 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -71,8 +71,6 @@ int suspend_device(struct device * dev, pm_message_t state)
                        dev->parent->power.power_state.event);
        }
 
-       dev->power.prev_state = dev->power.power_state;
-
        if (dev->class && dev->class->suspend && !dev->power.power_state.event) 
{
                suspend_device_dbg(dev, state, "class ");
                error = dev->class->suspend(dev, state);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 24f10a1..a9cf8b3 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1109,11 +1109,6 @@ void usb_root_hub_lost_power(struct usb_device *rhdev)
 
        dev_warn(&rhdev->dev, "root hub lost power or was reset\n");
 
-       /* Make sure no potential wakeup events get lost,
-        * by forcing the root hub to be resumed.
-        */
-       rhdev->dev.power.prev_state.event = PM_EVENT_ON;
-
        spin_lock_irqsave(&device_state_lock, flags);
        hub = hdev_to_hub(rhdev);
        for (port1 = 1; port1 <= rhdev->maxchild; ++port1) {
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 6e7f066..273781c 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -267,7 +267,6 @@ struct dev_pm_info {
        unsigned                can_wakeup:1;
 #ifdef CONFIG_PM
        unsigned                should_wakeup:1;
-       pm_message_t            prev_state;
        struct list_head        entry;
 #endif
 };
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to