summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-22 21:08:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-22 21:08:52 -0700
commit68d0080f1e222757c85606d3eaf81b5c4aa7719f (patch)
tree5f177f7571a56e7dfe3888f67fcc86532be8235c /include
parentf957db4fcdd8f03e186aa8f041f4049e76ab741c (diff)
parenta5f76d5eba157bf637beb2dd18026db2917c512e (diff)
downloadlinux-3.10-68d0080f1e222757c85606d3eaf81b5c4aa7719f.tar.gz
linux-3.10-68d0080f1e222757c85606d3eaf81b5c4aa7719f.tar.bz2
linux-3.10-68d0080f1e222757c85606d3eaf81b5c4aa7719f.zip
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PCI / PM: Block races between runtime PM and system sleep PM / Domains: Update documentation PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset PM: Fix async resume following suspend failure PM: Free memory bitmaps if opening /dev/snapshot fails PM: Rename dev_pm_info.in_suspend to is_prepared PM: Update documentation regarding sysdevs PM / Runtime: Update doc: usage count no longer incremented across system PM
Diffstat (limited to 'include')
-rw-r--r--include/linux/device.h4
-rw-r--r--include/linux/pm.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index c66111affca..553fd37b173 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -654,13 +654,13 @@ static inline int device_is_registered(struct device *dev)
static inline void device_enable_async_suspend(struct device *dev)
{
- if (!dev->power.in_suspend)
+ if (!dev->power.is_prepared)
dev->power.async_suspend = true;
}
static inline void device_disable_async_suspend(struct device *dev)
{
- if (!dev->power.in_suspend)
+ if (!dev->power.is_prepared)
dev->power.async_suspend = false;
}
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 3160648ccdd..411e4f4be52 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -425,7 +425,8 @@ struct dev_pm_info {
pm_message_t power_state;
unsigned int can_wakeup:1;
unsigned int async_suspend:1;
- unsigned int in_suspend:1; /* Owned by the PM core */
+ bool is_prepared:1; /* Owned by the PM core */
+ bool is_suspended:1; /* Ditto */
spinlock_t lock;
#ifdef CONFIG_PM_SLEEP
struct list_head entry;