aboutsummaryrefslogtreecommitdiff
path: root/Documentation/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-11-23 21:19:57 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-11-28 22:14:27 +0100
commitfa8ce723936460fcf7e49f508fd5dbd5125e39c4 (patch)
tree9a5dd5d6ab1e780d4209d79dd49c7890c3909f44 /Documentation/power
parent5841eb6402707a387b216373e65c9c28e8136663 (diff)
downloadlinux-fa8ce723936460fcf7e49f508fd5dbd5125e39c4.tar.gz
PM / Sleep: Correct inaccurate information in devices.txt
The documentation file Documentation/power/devices.txt contains some information that isn't correct any more due to code modifications made after that file had been created (or updated last time). Fix this. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'Documentation/power')
-rw-r--r--Documentation/power/devices.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt
index 4342acbeee1..ed322888413 100644
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
@@ -250,7 +250,7 @@ for every device before the next phase begins. Not all busses or classes
support all these callbacks and not all drivers use all the callbacks. The
various phases always run after tasks have been frozen and before they are
unfrozen. Furthermore, the *_noirq phases run at a time when IRQ handlers have
-been disabled (except for those marked with the IRQ_WAKEUP flag).
+been disabled (except for those marked with the IRQF_NO_SUSPEND flag).
All phases use PM domain, bus, type, or class callbacks (that is, methods
defined in dev->pm_domain->ops, dev->bus->pm, dev->type->pm, or dev->class->pm).
@@ -295,9 +295,8 @@ When the system goes into the standby or memory sleep state, the phases are:
After the prepare callback method returns, no new children may be
registered below the device. The method may also prepare the device or
- driver in some way for the upcoming system power transition (for
- example, by allocating additional memory required for this purpose), but
- it should not put the device into a low-power state.
+ driver in some way for the upcoming system power transition, but it
+ should not put the device into a low-power state.
2. The suspend methods should quiesce the device to stop it from performing
I/O. They also may save the device registers and put it into the