projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PM: sleep: Add dev_wakeup_path() helper
[linux-2.6-microblaze.git]
/
drivers
/
base
/
power
/
main.c
diff --git
a/drivers/base/power/main.c
b/drivers/base/power/main.c
index
205a067
..
4679327
100644
(file)
--- a/
drivers/base/power/main.c
+++ b/
drivers/base/power/main.c
@@
-363,7
+363,6
@@
static pm_callback_t pm_op(const struct dev_pm_ops *ops, pm_message_t state)
case PM_EVENT_THAW:
case PM_EVENT_RECOVER:
return ops->thaw;
case PM_EVENT_THAW:
case PM_EVENT_RECOVER:
return ops->thaw;
- break;
case PM_EVENT_RESTORE:
return ops->restore;
#endif /* CONFIG_HIBERNATE_CALLBACKS */
case PM_EVENT_RESTORE:
return ops->restore;
#endif /* CONFIG_HIBERNATE_CALLBACKS */
@@
-442,9
+441,9
@@
static pm_callback_t pm_noirq_op(const struct dev_pm_ops *ops, pm_message_t stat
static void pm_dev_dbg(struct device *dev, pm_message_t state, const char *info)
{
static void pm_dev_dbg(struct device *dev, pm_message_t state, const char *info)
{
- dev_dbg(dev, "%s%s%s\n", info, pm_verb(state.event),
+ dev_dbg(dev, "%s%s%s
driver flags: %x
\n", info, pm_verb(state.event),
((state.event & PM_EVENT_SLEEP) && device_may_wakeup(dev)) ?
((state.event & PM_EVENT_SLEEP) && device_may_wakeup(dev)) ?
- ", may wakeup" : "");
+ ", may wakeup" : ""
, dev->power.driver_flags
);
}
static void pm_dev_err(struct device *dev, pm_message_t state, const char *info,
}
static void pm_dev_err(struct device *dev, pm_message_t state, const char *info,
@@
-1360,7
+1359,7
@@
static void dpm_propagate_wakeup_to_parent(struct device *dev)
spin_lock_irq(&parent->power.lock);
spin_lock_irq(&parent->power.lock);
- if (dev
->power.wakeup_path
&& !parent->power.ignore_children)
+ if (dev
ice_wakeup_path(dev)
&& !parent->power.ignore_children)
parent->power.wakeup_path = true;
spin_unlock_irq(&parent->power.lock);
parent->power.wakeup_path = true;
spin_unlock_irq(&parent->power.lock);
@@
-1628,7
+1627,7
@@
static int __device_suspend(struct device *dev, pm_message_t state, bool async)
goto Complete;
/* Avoid direct_complete to let wakeup_path propagate. */
goto Complete;
/* Avoid direct_complete to let wakeup_path propagate. */
- if (device_may_wakeup(dev) || dev
->power.wakeup_path
)
+ if (device_may_wakeup(dev) || dev
ice_wakeup_path(dev)
)
dev->power.direct_complete = false;
if (dev->power.direct_complete) {
dev->power.direct_complete = false;
if (dev->power.direct_complete) {