diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 18:03:46 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 18:03:46 -0400 |
commit | b4269e2799993fce54f5003a3597e6fa8b621993 (patch) | |
tree | 869349742d36518fef6f7eb73f03c968d582130c /Documentation/power | |
parent | bfaa07bc322085582bdc40babb9d0cce17b57380 (diff) | |
parent | 8d2c794108aed16602de1fcc37e485e9243ab5c0 (diff) |
Merge branch 'pm-doc'
* pm-doc:
PM / Documentation: fix typos in power management description
Diffstat (limited to 'Documentation/power')
-rw-r--r-- | Documentation/power/devices.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt index 872815cd41d3..504dfe4d52eb 100644 --- a/Documentation/power/devices.txt +++ b/Documentation/power/devices.txt | |||
@@ -583,9 +583,10 @@ for the given device during all power transitions, instead of the respective | |||
583 | subsystem-level callbacks. Specifically, if a device's pm_domain pointer is | 583 | subsystem-level callbacks. Specifically, if a device's pm_domain pointer is |
584 | not NULL, the ->suspend() callback from the object pointed to by it will be | 584 | not NULL, the ->suspend() callback from the object pointed to by it will be |
585 | executed instead of its subsystem's (e.g. bus type's) ->suspend() callback and | 585 | executed instead of its subsystem's (e.g. bus type's) ->suspend() callback and |
586 | anlogously for all of the remaining callbacks. In other words, power management | 586 | analogously for all of the remaining callbacks. In other words, power |
587 | domain callbacks, if defined for the given device, always take precedence over | 587 | management domain callbacks, if defined for the given device, always take |
588 | the callbacks provided by the device's subsystem (e.g. bus type). | 588 | precedence over the callbacks provided by the device's subsystem (e.g. bus |
589 | type). | ||
589 | 590 | ||
590 | The support for device power management domains is only relevant to platforms | 591 | The support for device power management domains is only relevant to platforms |
591 | needing to use the same device driver power management callbacks in many | 592 | needing to use the same device driver power management callbacks in many |
@@ -598,7 +599,7 @@ it into account in any way. | |||
598 | Device Low Power (suspend) States | 599 | Device Low Power (suspend) States |
599 | --------------------------------- | 600 | --------------------------------- |
600 | Device low-power states aren't standard. One device might only handle | 601 | Device low-power states aren't standard. One device might only handle |
601 | "on" and "off, while another might support a dozen different versions of | 602 | "on" and "off", while another might support a dozen different versions of |
602 | "on" (how many engines are active?), plus a state that gets back to "on" | 603 | "on" (how many engines are active?), plus a state that gets back to "on" |
603 | faster than from a full "off". | 604 | faster than from a full "off". |
604 | 605 | ||