summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/base/power/resume.c3
-rw-r--r--drivers/base/power/suspend.c2
-rw-r--r--drivers/usb/core/hub.c5
-rw-r--r--include/linux/pm.h1
4 files changed, 1 insertions, 10 deletions
diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 99679e7a6cc6..0c9610688542 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 af2cedfbc1b4..5178b0fbd82e 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 24f10a19dbdb..a9cf8b30bccc 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 6e7f06671683..273781c82e4d 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
};
OpenPOWER on IntegriCloud